Fix ESBJAVA-3168