Cherry-pick 5fca9d90 into releases/2.6

Merge request reports

Loading