Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev