Merge branch 'hotfix/navigation-links'
Merge branch 'develop'