Fixed metadata set for groupings
Merge branch 'test' into dev