Merge "Fix group id"