Fix navigation
Merge branch 'MH-905' into dev