Fix ESBJAVA-3255
Fix ESBJAVA-3255