Beta Merge

See CHANGELOG.md