applying patch by dushan to fix ESBJAVA-3125