Merge "Fixed the issue Possible to crate duplicate label/group."