applying patch from sohani for TOOLS-2636