Merge "add hidden method setTestNetworkAsUpstream" into main