merge from akhadm/azure-powershell/dev