Merge branch 'jc/merge' into next