[WIP] [HOTFIX] Navigation performance