Merge branch 'jc/push-to-checkout'