Merge branch 'js/complete-checkout-t' into maint-2.42