[OES-107] Remove obsolete ward assignment hacks
Merge branch 'master' into develop