Fix fields for locality
Merge branch 'master' into production