Merge "Flush permission cache when we change delegates" into rvc-dev