Merge "Fix updateInfrequentCount logic" into main