Update from `main`

[michplunkett]

Description of Changes

Syncing develop with the main branch so we can do a deployment.

Tests and linting

• [x] This branch is up-to-date with the develop branch.
• [x] pytest passes on my local development environment.
• [x] pre-commit passes on my local development environment.

[b-meson]

Merge back from main to develop