Nav race condition fix
Merge branch 'master' of https://github.com/Branded-Experiences/gmc-trade-secrets