Update data and tests.
Merge branch 'public' into develop