Fail early on wrong join field name
Update to latest data
Fix tests
Merge branch 'public' into 3000