Merge pull request #7800 from BruceForstall/ChangeJITGuid