Merge branch 'master' of github.com:NUBIC/ncs_navigator_core