Merge branch 'master' into ao-validator-discovery-api

* master:
  Make collation an optional return (#1787)
  XCM: Land xcm-handler and xcm-executor (#1771)
  v0.8.25 (#1785)
  add two node local net script (#1781)
  Adjust max nominators down to 128 (from 256) (#1782)
  Companion for substrate/pull/7215 (#1768)
  Remove Stale Upgrades (#1780)
  Update Polkadot Weights for Substrate 2.0 (#1761)
  Parachains v1 registrar module. (#1559)
  Derive `From` for `AllMessages` and simplify `send_msg` (#1774)
  implement remaining subsystem metrics (#1770)
  Companion for https://github.com/paritytech/substrate/pull/7236 (#1773)
  WIP: remove deprecated only/except clauses, build is now manual on PRs (#1769)
  Increase Westend `spec_version` (#1766)
  move Metrics to utils (#1765)