Fix for TOOLS-2662