Merge branch 'cc/merge-base-many'