Merge "Split requestDownstreamAddress into two methods" into main