Update to latest data
Fix tests
Bump version
Merge branch 'public' into 3000