Fixed TOOLS-2540.