Further NavService work - small fix in partial2
Merge remote branch 'origin/master'