Merge branch 'jk/clone-dissociate' into maint