Merge branch 'jc/clone-borrow'