Move optimisation earlier

Closes #3557579

Merge request reports

Loading