Merge branch 'jc/combine' into next