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