Update to latest data
Fix tests
Minor data bump
Merge branch 'public' into 3000