typofixes
Update Changelog
Merge branch 'next'