Merge branch 'js/checkout-dwim-local'