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