#1058757 district management

See merge request xrm/basic!342