Merge branch 'fix-data-parse-error' into develop