Fix ESBJAVA-3431