Merge branch 'tb/checkout-doc' into maint