[#72346618] header and spaces in net
Merge 72346618-net-changes to master

[Completes #72346618]