Merge "Add section headers back to group lists"