merge from the azure/azure-sdk-tools/dev