Optimize the function 'Context.Name()' and replace 'Context.Container… Upstream-commit: e026f80a4d217eda5622c2b984fde2cdb8da0dc3 Component: engine