Merge "Do not link networks just because the passwords match" into sc-dev