Fix ESBJAVA-3284