Links permissions
Menu permissions
Merge branch 'hotfix/hotfix'