Merge branch 'next'
update changelog
Merge branch 'master' into next