ESBJAVA-3264