Merge branch 'jc/clone'