Applying patch from sohani fix TOOLS-2532