ESBJAVA-3114 by Gokul
Merge pull request #93 from miyuru/master

ESBJAVA-3114 by Gokul