Merge branch 'upstream-beta' into beta
Bump version in changelog