Fix ESBJAVA-3171