merge changes for group api