Merge branch 'jk/maint-1.6.3-checkout-unborn' into maint