Grouper speacil case

Change-Id: I6f802bb9bbf6cdd8a8692679c737258672291d38