Merge "Fix permissions xml and provider access" into main