Related events not correctly sanitized in the xml export
Merge branch 'hotfix-2.3.25'