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