Registry tiny code improvements Upstream-commit: f7c0d0ec5041ae32830a1edb79dfec55cba7b261 Component: engine