Bugfixes: group descriptor was not properly generated

Change-Id: I05ed09fc97b08b3122e5c82bea9e1c02f6b13fe7