Merge "(P) Revoke permision when group changed" into pi-dev