Merge pull request #1266 from Azure/aw/issue1263