Merge branch 'develop' into checkout
Merge branch 'checkout' of gg:cbt-gem into checkout