Apply changes from Azure/M16 to Azure/m18

Merged changes in azure m16 branch to the Azure m18 branch

Merge request reports

Loading