Code

Merge branch 'nd/maint-hide-checkout-index-from-error' into maint