Merge "Fix autogroupsummary bug" into tm-dev