#982 nav bar link optional
Merge origin/master