Merge to `main` branch (Week of 11-Dec-23, Part 3)
Cherry-picking commits:
- 5ae5cc9a from !172 (merged)
- 02a31e18 and 5d1d633f from !171 (merged)
- 8e194d1d, 1d9bdea5, and fc0db7b8 from !176 (merged)
- 43868b99 from !175 (merged)
Edited by Adam Johnston