Merge branch 'develop' - See `CHANGELOG.md` for details.