Merge branch 'db/checkout'