Merge "Remove registerGroups interface" into main