Update to latest data
Fix tests
Bump version
Merged with public