Merge Delta changes from M16 master to M18 master

Merge Delta changes from M16 master to M18 master

Merge request reports

Loading