Implemented changes CORE-1533
Merge pull request #539 from saravanab/master

Implemented changes CORE-1533