Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint