Draft: Resolve "more changes for XIOS3"

Andrew Coward requested to merge 304-more-changes-for-xios3 into main

Closes #304

Merge request reports