Backport master to 7.0.1

- [x] Waiting for #129
- [x] Waiting for #127 
- [x] Waiting for #122 
- [x] Waiting for #121