fixes #6608 name empty on save
Merge branch 'redistricting' into prod