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