Fix for ESBJAVA-3345