Fix ESBJAVA-3320