Merge "Verify reevaluation triggered when VPN validation fails" into main