Code

Merge branch 'tc/checkout-B'