final changes of 10th sept
Merge branch 'Pooja' of github.com:tbedi/KeausMapPolicyDefender into Alex