Fix for #8777 (continuing PR #9061) Upstream-commit: d7626e97b61f5f8f5d585ec82d6154395a3f9404 Component: engine