Bring code in line with L2SS-1509:

Merge request reports

Loading