[MERGE] project: merge with cha branch to get the new group