Merge branch 'jk/clone-copy-alternates-fix'