Merge branch 'jc/maint-clone-alternates'