Merge "Add test to make sure that unwanted local nets disconnect correctly" into main