Data update
Update tests
Merge branch 'public' into develop