Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Upstream-commit: 439de7694d67eede9867aae12f304772962bffcd Component: engine