Merge "Don't reset connections switching default->hipri"