Merge branch 'tb/complete-checkout'