Modify to improve code readability Upstream-commit: f5283bd253868b6f27b833e7eb7b6c36d45d2096 Component: engine