Merge branch 'hotfix/state-chart'
Turned off caching for stats export
Merge branch 'hotfix/export-cache' into develop