Merge branch 'enhancement/SlimDownNavigation' into local