Merge "Fix autogroupsummary bug"