Merge "Add direct members and directly included groups to GroupInfo"