*: normalize the use of normalize Upstream-commit: 88c0317e23449d6ff730a1073f240586cbdfd4ba Component: engine