Cleanup and preparations for #805

Merge request reports

Loading