Merge branch 'master' into navigator_new_vector fix