Please get this merge to get the latest for the navbar.