CLC-2883 Fix stats recording