Fix for TOOLS-2662 by awanthika