patch for ESBJAVA-3015