Added support to CORE-836
Merge pull request #113 from saravanab/master

Added support to CORE-836