Rollup of [189, 190] pull requests

- Successful merges: #189, #190
- Failed merges: