Merge pull request #2093 from MicrosoftDocs/master edupont04 from OPS portal: Merge from master to live