Merge branch '2023-07-27-assorted-network-updates'

- Merge a few network updates