Stronger escaping of special characters in the XML exports
Merge branch 'hotfix-2.3.25' into develop