#671 : Re-introduce support for friendly permissions
#671 Increase max results for permissions fetch
Merge branch 'develop' into Permission_Refactor
Merge branch 'develop' into Permission_Refactor
Merge branch 'Permission_Refactor' into develop