Pull request to sethurinivasan:dev from Azure:dev