ESBJAVA-3227