Following the fixes at XWIKI-22765 and XWIKI-22764, groups are now updated and not overwritten, so there's nothing else to do on the confluence-xml side: the behavior should be correct on any version of XWiki with these fixes.
This message was sent by Atlassian Jira (v9.3.0#930000-sha1:287aeb6)
If image attachments aren't displayed, see this article.