merge from azure-powershell/dev