Subsurface reordering fixes

See commits

Merge request reports

Loading