Merge "modified meter and group enum from leaf to typedef."