Merge main into develop after v3.1.0 release

[joelvdavies]

Description

Merges main into develop following the release of v3.1.0.

Testing instructions

Add a set of instructions describing how the reviewer should test the code

• Review code
• Check Actions build
• Review changes to test coverage

[codecov-commenter]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 86.95%. Comparing base (021b776) to head (48678a4).
⚠️ Report is 14 commits behind head on develop.

Additional details and impacted files

@@           Coverage Diff            @@
##           develop     #334   +/-   ##
========================================
  Coverage    86.95%   86.95%           
========================================
  Files           10       10           
  Lines          322      322           
========================================
  Hits           280      280           
  Misses          42       42           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[joshdimanteto]

LGTM