Rollup of 3 pull requests

- Successful merges: #240, #231, #232
- Failed merges: #241, #239