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