Merge "Refactor to remove speed feature dependency on mode search order"