Removed menu links features
Merge branch 'hotfix/release-9-fixes-2'