finish checkout
Merge branch 'checkout' into develop
Merge branch 'release-1.0'