Merge "Fixes wrong id when granting provider access" into rvc-dev