Merge branch 'dl/checkout-p-merge-base'