Fix ESBJAVA-3211 & ESBJAVA-3263