Merge branch 'kb/checkout-optim'