Merge "Don't reset user VPN without reason" into sc-dev