Ensure proper ordering in linking negotiation
Merge branch 'link-state' into next

* link-state:
  Ensure proper ordering in linking negotiation