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