Fixing ESBJAVA-3025
Merge pull request #11 from Gayany/master

Fixing ESBJAVA-3025
ESBJAVA-3047 fix