Encode group name in creation

Ticket:	#7313
(cherry picked from commit 13505f02a3015b34d0d00fb8908252d9b37c9139)