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