Minor code changes revolving around source mirroring

Backport of #758 (closed)

Merge request reports

Loading