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