[CLC-1369] Verbosity fixes