Fixing ESBJAVA-3327.
ESBJAVA-3312