Merge branch 'jc/checkout'