Applying patch from Awanthika for TOOLS-2626