Merge "Fix to the admin user grant permissions test" into main