Merge "Separate checks for different types of permission checks" into rvc-dev