diff --git a/.beta-build b/.beta-build
index fe0dd53b3..0d4336f8a 100644
--- a/.beta-build
+++ b/.beta-build
@@ -1 +1 @@
-3501
+3509
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 059dcd18b..6ebe69234 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## 2.2.0 (2023-07-23)
 
 ### Added
 
diff --git a/Gemfile.lock b/Gemfile.lock
index d4e81329b..cc043510d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.787.0)
+    aws-partitions (1.791.0)
     aws-sdk-core (3.178.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
@@ -17,7 +17,7 @@ GEM
     aws-sdk-kms (1.71.0)
       aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.130.0)
+    aws-sdk-s3 (1.131.0)
       aws-sdk-core (~> 3, >= 3.177.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
@@ -106,9 +106,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.45.0)
+    google-apis-androidpublisher_v3 (0.46.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-core (0.11.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -137,7 +137,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.6.0)
+    googleauth (1.7.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -217,4 +217,4 @@ DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   2.4.15
+   2.4.17
diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj
index 9bd28aea1..04708ea90 100644
--- a/Passepartout.xcodeproj/project.pbxproj
+++ b/Passepartout.xcodeproj/project.pbxproj
@@ -1771,7 +1771,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CURRENT_PROJECT_VERSION = 3501;
+				CURRENT_PROJECT_VERSION = 3509;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1838,7 +1838,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CURRENT_PROJECT_VERSION = 3501;
+				CURRENT_PROJECT_VERSION = 3509;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
@@ -1872,7 +1872,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Passepartout/App/App.entitlements;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3501;
+				CURRENT_PROJECT_VERSION = 3509;
 				DEVELOPMENT_TEAM = DTDYD63ZX9;
 				INFOPLIST_FILE = Passepartout/App/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1899,7 +1899,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Passepartout/App/App.entitlements;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3501;
+				CURRENT_PROJECT_VERSION = 3509;
 				DEVELOPMENT_TEAM = DTDYD63ZX9;
 				INFOPLIST_FILE = Passepartout/App/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1994,7 +1994,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 3501;
+				CURRENT_PROJECT_VERSION = 3509;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Passepartout/Mac/Info.plist;
@@ -2028,7 +2028,7 @@
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 3501;
+				CURRENT_PROJECT_VERSION = 3509;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Passepartout/Mac/Info.plist;
diff --git a/Passepartout/App/Info.plist b/Passepartout/App/Info.plist
index b516b6805..584f7b4b4 100644
--- a/Passepartout/App/Info.plist
+++ b/Passepartout/App/Info.plist
@@ -34,7 +34,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>3501</string>
+	<string>3509</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Passepartout/App/fastlane/ios/metadata/de-DE/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/de-DE/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/ios/metadata/de-DE/release_notes.txt
+++ b/Passepartout/App/fastlane/ios/metadata/de-DE/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/ios/metadata/el/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/el/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/ios/metadata/el/release_notes.txt
+++ b/Passepartout/App/fastlane/ios/metadata/el/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/ios/metadata/en-US/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/en-US/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/ios/metadata/en-US/release_notes.txt
+++ b/Passepartout/App/fastlane/ios/metadata/en-US/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/ios/metadata/es-MX/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/es-MX/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/ios/metadata/es-MX/release_notes.txt
+++ b/Passepartout/App/fastlane/ios/metadata/es-MX/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/ios/metadata/fr-FR/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/fr-FR/release_notes.txt
index 5e86ab27b..c90297647 100755
--- a/Passepartout/App/fastlane/ios/metadata/fr-FR/release_notes.txt
+++ b/Passepartout/App/fastlane/ios/metadata/fr-FR/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/ios/metadata/it/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/it/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/ios/metadata/it/release_notes.txt
+++ b/Passepartout/App/fastlane/ios/metadata/it/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/ios/metadata/nl-NL/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/nl-NL/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/ios/metadata/nl-NL/release_notes.txt
+++ b/Passepartout/App/fastlane/ios/metadata/nl-NL/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/ios/metadata/pl/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/pl/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/ios/metadata/pl/release_notes.txt
+++ b/Passepartout/App/fastlane/ios/metadata/pl/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/ios/metadata/pt-BR/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/pt-BR/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/ios/metadata/pt-BR/release_notes.txt
+++ b/Passepartout/App/fastlane/ios/metadata/pt-BR/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/ios/metadata/ru/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/ru/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/ios/metadata/ru/release_notes.txt
+++ b/Passepartout/App/fastlane/ios/metadata/ru/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/ios/metadata/sv/release_notes.txt b/Passepartout/App/fastlane/ios/metadata/sv/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/ios/metadata/sv/release_notes.txt
+++ b/Passepartout/App/fastlane/ios/metadata/sv/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/mac/metadata/de-DE/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/de-DE/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/mac/metadata/de-DE/release_notes.txt
+++ b/Passepartout/App/fastlane/mac/metadata/de-DE/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/mac/metadata/el/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/el/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/mac/metadata/el/release_notes.txt
+++ b/Passepartout/App/fastlane/mac/metadata/el/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/mac/metadata/en-US/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/en-US/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/mac/metadata/en-US/release_notes.txt
+++ b/Passepartout/App/fastlane/mac/metadata/en-US/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/mac/metadata/es-MX/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/es-MX/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/mac/metadata/es-MX/release_notes.txt
+++ b/Passepartout/App/fastlane/mac/metadata/es-MX/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/mac/metadata/fr-FR/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/fr-FR/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/mac/metadata/fr-FR/release_notes.txt
+++ b/Passepartout/App/fastlane/mac/metadata/fr-FR/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/mac/metadata/it/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/it/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/mac/metadata/it/release_notes.txt
+++ b/Passepartout/App/fastlane/mac/metadata/it/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/mac/metadata/nl-NL/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/nl-NL/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/mac/metadata/nl-NL/release_notes.txt
+++ b/Passepartout/App/fastlane/mac/metadata/nl-NL/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/mac/metadata/pl/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/pl/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/mac/metadata/pl/release_notes.txt
+++ b/Passepartout/App/fastlane/mac/metadata/pl/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/mac/metadata/pt-BR/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/pt-BR/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/mac/metadata/pt-BR/release_notes.txt
+++ b/Passepartout/App/fastlane/mac/metadata/pt-BR/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/mac/metadata/ru/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/ru/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/mac/metadata/ru/release_notes.txt
+++ b/Passepartout/App/fastlane/mac/metadata/ru/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/App/fastlane/mac/metadata/sv/release_notes.txt b/Passepartout/App/fastlane/mac/metadata/sv/release_notes.txt
index 5e86ab27b..c90297647 100644
--- a/Passepartout/App/fastlane/mac/metadata/sv/release_notes.txt
+++ b/Passepartout/App/fastlane/mac/metadata/sv/release_notes.txt
@@ -1,8 +1,9 @@
-### Fixed
+### Added
 
-- Allow wildcards in proxy bypass domains.
-- Fail gracefully when refreshing infrastructure.
-- Only show 'Reconnect' on active profile.
-- IPv4/6 address validation.
-- Domain name validation.
+- OpenVPN: Allow editing of endpoints.
+
+### Changed
+
+- OpenVPN: Endpoint UX.
+- Convert trusted networks to on-demand activation.
 
diff --git a/Passepartout/Launcher/Info.plist b/Passepartout/Launcher/Info.plist
index 92a59ee1f..d6e171e10 100644
--- a/Passepartout/Launcher/Info.plist
+++ b/Passepartout/Launcher/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>3501</string>
+	<string>3509</string>
 	<key>LSBackgroundOnly</key>
 	<true/>
 	<key>CFBundleIdentifier</key>
diff --git a/Passepartout/Mac/Info.plist b/Passepartout/Mac/Info.plist
index 18824ea0c..4bc1b7057 100644
--- a/Passepartout/Mac/Info.plist
+++ b/Passepartout/Mac/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>3501</string>
+	<string>3509</string>
 	<key>NSPrincipalClass</key>
 	<string>$(PRODUCT_MODULE_NAME).PassepartoutMac</string>
 	<key>com.algoritmico.Passepartout.config</key>
diff --git a/Passepartout/Tunnel/Info.plist b/Passepartout/Tunnel/Info.plist
index 3e1dfe090..989feb161 100644
--- a/Passepartout/Tunnel/Info.plist
+++ b/Passepartout/Tunnel/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>3501</string>
+	<string>3509</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>
diff --git a/PassepartoutLibrary/Sources/PassepartoutProvidersImpl/API b/PassepartoutLibrary/Sources/PassepartoutProvidersImpl/API
index 27974b18a..2a0f977f4 160000
--- a/PassepartoutLibrary/Sources/PassepartoutProvidersImpl/API
+++ b/PassepartoutLibrary/Sources/PassepartoutProvidersImpl/API
@@ -1 +1 @@
-Subproject commit 27974b18ac9bda4dbc41a7b5fa23db149680b9ab
+Subproject commit 2a0f977f495815ff2ff0afdeb2f5f9367c85acb6