Upgrade to new permissions format (Array)
Merge remote branch 'origin/upgrade_to_new_permissions_format'