Correction for HIW navigation update
Merge branch 'hiw'