Merge pull request #1258 from Azure/ay_GHFix1232