Navigation target hotfix
Merge branch 'hotfix/navigation_target_hotfix'