Merged group name commit from develop