Fixes and refinements on !500

Merge request reports

Loading