Fix the data files
Merge branch 'hotfix-1.1.3' into develop