Finally, finally, close #12164 Upstream-commit: 2e2e36e476defa4f6fe45c49d32fafa8e0386930 Component: engine