Fix for ESBJAVA-3470