Merge "DO NOT MERGE (N) Revoke permision when group changed" into nyc-dev