Merge "Add check for cross user permission" into rvc-dev