Cherrypick/m14 to m16

Merged Mahsa Hanifi requested to merge cherrypick/m14-to-m16 into azure/m16-master

Merge request reports