Merge branch 'hotfix-2.3.2'
Upgrade to the upgrade documentation to remove the old cache data
Merge branch 'hotfix-2.3.3' into develop