Adding delta changes from m16 to m18

Merge request template

Merge request reports

Loading