Merge early part of 'jc/combine' branch