NavajoManager uses LocalClient instead of Dispatcher
Merge branch 'master' into HEAD