[xwiki-notifications] [[email protected]][Issue] Updates for BVERSION-254: Variant macro merges with content from macro in its content