Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 26413ede5781cd13d62cbdaf4671d056ca8bba83) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: ffeebb217c1da556c2dc686fbff80cbb5d74e564 Component: engine