Merge branch 'nd/checkout-disambiguation' into maint