Code

Merge branch 'jc/clone-branch-rebase'