Merge branch 'jc/merge-bases'