Merge pull request #13863 from pgavlin/DevDiv491211