Merge branch 'next' into upstream-merge