Merge branch 'hotfix/hotfix'
Navigation hotfix
Merge branch 'hotfix/hotfix' into develop