case 3784 - Custom permissions.
Merge branch 'case-3784' into develop