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