Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit 32f48058158cce7a6a1f8f0d1526d8224b369cbc) Upstream-commit: 43dedf397503532f8bc1313af82a9356ed8c3550 Component: engine