Fixes from ticket #HGI-3507

Merge request reports

Loading