Merge branch 'hotfix/fix-menu-feature'
Exported modified features & added menu links for resources
Merge branch 'hotfix/hotfix-6.3' into develop