BK-1032 Fails when two groups have the same name
Merge branch 'BK1032_1' into 2.0