Fix ESBJAVA-3230