This PR is a new version of #509, which was created since, due to #509 being a quite long-lived PR, it turned out to be easier to create a new branch from master and incorporate the changes than rebasing.
Checklist
[x] Commit sequence broadly makes sense and commits have useful messages
[x] Any semantic changes to the specifications are documented in CHANGELOG.md
Description
This PR is a new version of #509, which was created since, due to #509 being a quite long-lived PR, it turned out to be easier to create a new branch from
masterand incorporate the changes than rebasing.Checklist
CHANGELOG.md