Merge branch 'jc/checkout-merge-base'