Fix ESBJAVA-3208