Fix ESBJAVA-3416