Merge "Replace references to the 192.0.2 network" into stable/ocata