[Chore] Merge main into develop (#1285)

### Description

Merges `main` into `develop`.

### Context

Git flow

### Testing

- `./gradlew test`

### Documentation

N/A

### Known limitations

N/A