Stop invalid calls to Registry Upstream-commit: cca9e51f5d9747dc03830f0c255543a0c9137cc3 Component: engine