Merge branch 'jc/checkout-m-twoway' into maint