part of fix for ESBJAVA-3222