Cherry pick from M16 master

[ci skip]

Merge request reports

Loading