Merge "Tighten network ownership" into main