Update data
Merge branch 'public' into develop
Update version
Merged with public