Merge branch 'hotfix/hotfix'
Links permissions
Menu permissions
Merge branch 'hotfix/hotfix' into develop