Merge branch 'js/clone-dissociate' into maint