Merge branch 'hotfix-2.2.31'
Update to the way xml files are cached
Removed junk left in the previous commit
Merge branch 'hotfix-2.2.32' into develop