Merge "Add cross user permission checks" into oc-mr1-dev