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