Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com> (cherry picked from commit 2f22247cad9237d255a4b541a974705802abdad8) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 69503ef832fed199e28ccfd731281a4e439a8eeb Component: engine