Merge branches 'jc/clone' and 'jc/name'