Merge branch 'nd/checkout-dwim-fix'