Adding patch from awanthika for TOOLS-2645