Merge branch 'add-group-to-clone-spec' into 1.0.x