WIP: Small step fixes (Replica Dave's branch to help debug)

Merge request reports

Loading