1. Improve highways, validation cleanups.

    Closed
    #179830576 0 2455 853 0

  2. Improve highways, validation cleanups.

    Closed
    #179830489 2445 4555 0 0