Merge to `main` branch (Week of 30-Oct-23)
Cherry picking commits:
- bbec41a4 and 6e21da17 from !140 (merged)
- 487a0eaf from !138 (merged)
- 7ec0ff47 from !141 (merged)
Note: Early this week because nothing else is pending and we might need FVP changes for !117 (merged)
Edited by Adam Johnston