Merge pull request #1296 from anilgooru/dev-branch

Bug fixes.
Remove CORE Districts Library
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: