Merge "Add missing groupId"