FIx for ESBJAVA-2697