Merge "Revoke invidivual permissions" into oc-mr1-dev