Merge pull request #4710 from Unity-Technologies/additional-config-checks