Merge "Implementing group renaming and deletion"