[xwiki-devs] [Discussion] Merge Annotations with Comments