applying patch by shafreen to fix ESBJAVA-3027