Merge branch 'jc/merge-base' (early part)