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