Merge to `main` branch (Week of 27-Nov-23)

Cherry-picking commits:

• 2fdfb83d and 2a5f7d38 from !156 (merged)
• 48df6f3a from !158 (merged)

Note: 48df6f3a is required in order to create Cassini 1.1.0 release candidate