Update data and tests.
Update data
Update version
Merge branch 'public' into 3000