[xwiki-notifications] [[email protected]][Issue] Updates for CRISTAL-212: Make embed less prone to conflicts