Cherry-pick azure/m16-master into azure/m18-master

Merge request template

Merge request reports

Loading