Port patch to MR

Merge request reports

Loading