More control navigation issue fix.
Merge branch 'origin/dev'