Merge branches 'master' and 'jc/combine' into next