Merge to `main` branch (Week of 20-Nov-23)
Cherry-picking commits:
- a158d212, 123545cf, and 77577bcf from !152 (merged)
- 3b7fe9da from !151 (merged)
- 60e5330f from !155 (merged)
Excluded commits:
- 75b66743 from !152 (merged) (main branch should keep tracking upstream master)
Edited by Adam Johnston