Merge "Reduce the number of columns for group queries" into ics-mr1