Merge branch 'merge' into next