Fix TOOLS-2398