Draft: Merge to `main` branch (Week of 15-Apr-2024, Pt 1)
Cherry-picking commits 50dee125, 778b3740, 16960433, 577b899e, b431eaf3, and 6f9086a1 from !242 (merged)
Commits 778b3740, 577b899e, and 6f9086a1 are amended to take account of 1cdad344 which was cherry-picked out of order.
To cleanup the history on master, the following fixes from !252 (merged) are also squashed out-of-order:
Edited by Adam Johnston