Fix ESBJAVA-3211