Merge "Don't emit net-info macro" into feature/zuulv3