Fix TOOL-2517, TOOL-2518