various improvements while preparing for resolution of #761

Merge request reports

Loading