adding feature query
finished feature query
Merge branch 'feature/remove_group_dependency' into develop