Added support and updated CORE-836
Merge pull request #117 from saravanab/master

Added support and updated CORE-836