Merge branch 'vs-2017-sln-guid' into release-3.9