Merge pull request #4051 from Unity-Technologies/registry-bug-fixes