Signed-off-by: Dimitris Mandalidis <dimitris.mandalidis@gmail.com> (cherry picked from commit d0192ae154e6244edd4bf1bb298ea24146378058) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: c51d247f030051abb4b97770d49bac30343e45c8 Component: engine