Fix ESBJAVA-3255
Fix ESBJAVA-3255
fix ESBJAVA-3255
fix ESBJAVA-3255
Merge pull request #97 from malakasilva/patch

Fix ESBJAVA-3255