Support cicrular groups

Change-Id: Ia48170b921f7d38b63318b5243d43ab1b0fe1c73