fixes #6357 fix double escaping
Merge branch 'redistricting' into prod