Put grouped_values_of
behind a feature gate
#2926
+17
−12
Merged