Merge "Match mixed network environment correctly" into sc-dev