Rest of !114

Zebedee Nichollsrequested to merge
rest-of-114 into main

Description

Rest of the things (except for actual implementation) I could find from !114 (closed)

Checklist

Please confirm that this pull request has done the following:

  • Tests added
  • Documentation added (where applicable)
  • Changelog item added to changelog/
Edited by Zebedee Nicholls

Merge request reports