Merge pull request #8163 from jitendrapurohit/nav-menu-fix