Merge branch 'js/checkout-detach-count' into maint