Merge branch 'master' into ao-update-deps

* master:
  babe: expose next epoch data (#7829)
  Fix master build (#7837)
  Improve spans of pallet macro (#7830)
  fix : remove `_{ }` syntax from benchmark macro (#7822)
  client/network: Use request response for block requests (#7478)