fixes and manual merge of !2492

Merge request reports

Loading