LPS-35118 Counting support