Merge pull request #1259 from Azure/aw/issue1252_v2