Fix navigation
Merge branch 'MH-911' into dev