Merge "Only match identical userIDs for autogroup summaries" into udc-dev