Implemented few more Changes to CORE-1236
Merge pull request #594 from saravanab/master

Implemented few more Changes to CORE-1236