Merge "Default implementation for addGroupWithParams" into main