Cherry picked changes from M16 to M18

Merge request reports

Loading