cherry-pick MR 659 from master

Merge request reports

Loading