patch for ESBJAVA-3052