Fixed metadata set on groups
Merge branch 'test' into dev