Draft: Cherrypick/m16 to m18

Merge request reports

Loading