Fixes #15785 Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Upstream-commit: 42961a66a5c1575d81c89aa258f6624f48bba94d Component: engine