Fixing NAV paths
Merge branch 'master' into develop