Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 86f2ac4a6b5b746c3309b57e7e04bdbdb70d46d7) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 8fcca0be3f31e8296a3ceefcb10acca636673b15 Component: engine