Merge branches 'jc/branch' and 'jc/rebase'