Move stuff around.

Closes #3560920

Merge request reports

Loading