Merge branch 'upstream-merge' into next