Fix bad english
Update references to mug on rename
Merge branch '48588-group-move-bug' into 48588-group-move-bug-for-staging