Merge branch 'sb/checkout-explit-detach-no-advice' into maint