PIM-1459 : Change behavior for create group/variant group