Merge pull request #9525 from danmosemsft/defines2