fixes #6331 validate successful tagging
fixes #6338 org retention relationship rule correction
Merge branch 'redistricting' into prod