Rollup of 3 pull requests

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