Merge to `main` branch (Week of 05-Feb-2024)
Adopting changes from !213 (merged)
- 8c97ba4a and 76978229 from !206 (merged)
- eea83efd from !212 (merged)
- f82506f0 explicitly set upstream branch for meta-cassini-bsp
Cherry-picking commits:
Edited by Adam Johnston