finish checkout
Merge branch 'checkout' into develop