Merge to `main` branch (Week of 8-Jan-2024)
Cherry-picking commits:
Reviewers to check own commits and flag if anything needs to be modified for main
Note: Commit 7d6bc2a1 from !194 (merged) will be merged as part of !207 (merged)
Edited by Adam Johnston