147 - nav update

tracker 24631
Merge pull request #400 from gsn/master

147 - nav update