Merge branch 'db/maint-checkout-b'