Rolling rework fixes

Merge request reports

Loading