Merge "Switch count_scalar to count for prometheus"