Merge "Upgrade permissions on PermissionController version change" into rvc-dev