Merge "Refactor: Extract group list manipulation"