Fix FindNavigator
Merge branch 'FixFind'