Fix for ESBJAVA-3275 by jsdjayanga