diff --git a/.maestro/data_clearing_tests/02_duckduckgo_settings.yml b/.maestro/data_clearing_tests/02_duckduckgo_settings.yml
index e2da0f3e3a..fa68b0c05a 100644
--- a/.maestro/data_clearing_tests/02_duckduckgo_settings.yml
+++ b/.maestro/data_clearing_tests/02_duckduckgo_settings.yml
@@ -40,6 +40,11 @@ tags:
     id: "alert.forget-data.confirm"
 - assertVisible:
     id: "searchEntry"
+- runFlow:
+    when:
+        visible: "Cancel"
+    commands:
+        - tapOn: "Cancel"
 - tapOn: "Close Tabs and Clear Data"
 - tapOn:
     id: "alert.forget-data.confirm"
diff --git a/.swiftlint.yml b/.swiftlint.yml
index 5808536458..9047bcb725 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -7,6 +7,7 @@ disabled_rules:
   - todo
   - unused_capture_list
   - trailing_comma
+  - cyclomatic_complexity
 
 opt_in_rules:
   - closure_end_indentation
diff --git a/Core/BookmarksCachingSearch.swift b/Core/BookmarksCachingSearch.swift
index af6ea20826..a874a05284 100644
--- a/Core/BookmarksCachingSearch.swift
+++ b/Core/BookmarksCachingSearch.swift
@@ -60,19 +60,7 @@ public class CoreDataBookmarksSearchStore: BookmarksSearchStore {
     public func bookmarksAndFavorites(completion: @escaping ([BookmarksCachingSearch.ScoredBookmark]) -> Void) {
 
         let context = bookmarksStore.makeContext(concurrencyType: .privateQueueConcurrencyType)
-
-        let fetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "BookmarkEntity")
-        fetchRequest.predicate = NSPredicate(
-            format: "%K = false AND %K == NO AND (%K == NO OR %K == nil)",
-            #keyPath(BookmarkEntity.isFolder),
-            #keyPath(BookmarkEntity.isPendingDeletion),
-            #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub)
-        )
-        fetchRequest.resultType = .dictionaryResultType
-        fetchRequest.propertiesToFetch = [#keyPath(BookmarkEntity.title),
-                                          #keyPath(BookmarkEntity.url),
-                                          #keyPath(BookmarkEntity.objectID)]
-        fetchRequest.relationshipKeyPathsForPrefetching = [#keyPath(BookmarkEntity.favoriteFolders)]
+        let fetchRequest = Self.shallowBookmarksFetchRequest(context: context)
 
         context.perform {
             let result = try? context.fetch(fetchRequest) as? [[String: Any]]
@@ -97,6 +85,38 @@ public class CoreDataBookmarksSearchStore: BookmarksSearchStore {
               externalContext.persistentStoreCoordinator == bookmarksStore.coordinator else { return }
         subject.send()
     }
+
+    /// Creates an `NSFetchRequest` to retrieve each bookmark as a shallow dictionary.
+    ///
+    /// The dictionary contains
+    ///   * `#keyPath(BookmarkEntity.title)`
+    ///   * `#keyPath(BookmarkEntity.url)`
+    ///   * `#keyPath(BookmarkEntity.objectID)`
+    ///   * `#keyPath(BookmarkEntity.favoriteFolders)`
+    ///
+    ///   Note that is `#keyPath(BookmarkEntity.favoriteFolders)` an `Int` representing the count of favorites folders this bookmark is contained in
+    public static func shallowBookmarksFetchRequest(context: NSManagedObjectContext) -> NSFetchRequest<NSFetchRequestResult> {
+        let favExpression = NSExpressionDescription()
+                favExpression.name = #keyPath(BookmarkEntity.favoriteFolders)
+                favExpression.expression = NSExpression(forFunction: "count:",
+                                                        arguments: [NSExpression(forKeyPath: #keyPath(BookmarkEntity.favoriteFolders))])
+                favExpression.expressionResultType = .integer64AttributeType
+
+        let fetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "BookmarkEntity")
+        fetchRequest.predicate = NSPredicate(
+            format: "%K = false AND %K == NO AND (%K == NO OR %K == nil)",
+            #keyPath(BookmarkEntity.isFolder),
+            #keyPath(BookmarkEntity.isPendingDeletion),
+            #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub)
+        )
+        fetchRequest.resultType = .dictionaryResultType
+        fetchRequest.propertiesToFetch = [#keyPath(BookmarkEntity.title),
+                                          #keyPath(BookmarkEntity.url),
+                                          #keyPath(BookmarkEntity.objectID),
+                                          favExpression]
+
+        return fetchRequest
+    }
 }
 
 public class BookmarksCachingSearch: BookmarksStringSearch {
@@ -125,14 +145,16 @@ public class BookmarksCachingSearch: BookmarksStringSearch {
             guard let title = bookmark[#keyPath(BookmarkEntity.title)] as? String,
                   let urlString = bookmark[#keyPath(BookmarkEntity.url)] as? String,
                   let url = URL(string: urlString),
-                  let objectID = bookmark[#keyPath(BookmarkEntity.objectID)] as? NSManagedObjectID else {
+                  let objectID = bookmark[#keyPath(BookmarkEntity.objectID)] as? NSManagedObjectID,
+                  let favoritesFolderCount = bookmark[#keyPath(BookmarkEntity.favoriteFolders)] as? Int
+                else {
                 return nil
             }
 
             self.init(objectID: objectID,
                       title: title,
                       url: url,
-                      isFavorite: (bookmark[#keyPath(BookmarkEntity.favoriteFolders)] as? Set<NSManagedObject>)?.isEmpty != true)
+                      isFavorite: favoritesFolderCount > 0)
         }
 
         public func togglingFavorite() -> BookmarksStringSearchResult {
diff --git a/Core/Debounce.swift b/Core/Debounce.swift
deleted file mode 100644
index 6994c3dda3..0000000000
--- a/Core/Debounce.swift
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-//  Debounce.swift
-//  DuckDuckGo
-//
-//  Copyright © 2019 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import Foundation
-
-public class Debounce {
-
-    private let queue: DispatchQueue
-    private let interval: TimeInterval
-
-    private var currentWorkItem = DispatchWorkItem(block: {})
-
-    public init(queue: DispatchQueue, seconds: TimeInterval) {
-        self.queue = queue
-        self.interval = seconds
-    }
-
-    public func schedule(_ block: @escaping (() -> Void)) {
-        currentWorkItem.cancel()
-        currentWorkItem = DispatchWorkItem(block: { block() })
-        queue.asyncAfter(deadline: .now() + interval, execute: currentWorkItem)
-    }
-}
diff --git a/Core/DefaultVariantManager.swift b/Core/DefaultVariantManager.swift
index b17b8de45d..98cbf59382 100644
--- a/Core/DefaultVariantManager.swift
+++ b/Core/DefaultVariantManager.swift
@@ -62,6 +62,10 @@ public struct VariantIOS: Variant {
         VariantIOS(name: "sc", weight: doNotAllocate, isIncluded: When.always, features: []),
         VariantIOS(name: "sd", weight: doNotAllocate, isIncluded: When.always, features: []),
         VariantIOS(name: "se", weight: doNotAllocate, isIncluded: When.always, features: []),
+
+        VariantIOS(name: "mc", weight: 1, isIncluded: When.inEnglish, features: []),
+        VariantIOS(name: "md", weight: 1, isIncluded: When.inEnglish, features: [.history]),
+
         returningUser
     ]
 
diff --git a/Core/FeatureFlag.swift b/Core/FeatureFlag.swift
index 1246732321..f14ae54cbf 100644
--- a/Core/FeatureFlag.swift
+++ b/Core/FeatureFlag.swift
@@ -34,7 +34,6 @@ public enum FeatureFlag: String {
     case networkProtection
     case networkProtectionWaitlistAccess
     case networkProtectionWaitlistActive
-    case subscription
     case swipeTabs
     case autoconsentOnByDefault
     case history
@@ -43,7 +42,7 @@ public enum FeatureFlag: String {
 extension FeatureFlag: FeatureFlagSourceProviding {
     public var source: FeatureFlagSource {
         switch self {
-        case .debugMenu, .appTrackingProtection, .subscription, .swipeTabs:
+        case .debugMenu, .appTrackingProtection, .swipeTabs:
             return .internalOnly
         case .sync:
             return .remoteReleasable(.subfeature(SyncSubfeature.level0ShowSync))
@@ -71,6 +70,7 @@ extension FeatureFlag: FeatureFlagSourceProviding {
             return .remoteReleasable(.subfeature(AutoconsentSubfeature.onByDefault))
         case .history:
             return .remoteReleasable(.feature(.history))
+        
         }
     }
 }
diff --git a/Core/HistoryCapture.swift b/Core/HistoryCapture.swift
index d63c7fd917..68e90a8953 100644
--- a/Core/HistoryCapture.swift
+++ b/Core/HistoryCapture.swift
@@ -40,17 +40,16 @@ public class HistoryCapture {
 
     public func webViewDidCommit(url: URL) {
         self.url = url
-        coordinator.addVisit(of: url.urlOrDuckDuckGoCleanQuery)
+        coordinator.addVisit(of: url)
     }
 
     public func titleDidChange(_ title: String?, forURL url: URL?) {
-        guard self.url == url else {
+        guard let url, self.url == url else {
             return
         }
 
-        guard let url = url?.urlOrDuckDuckGoCleanQuery, let title, !title.isEmpty else {
-            return
-        }
+        guard let title, !title.isEmpty else { return }
+
         coordinator.updateTitleIfNeeded(title: title, url: url)
         coordinator.commitChanges(url: url)
     }
diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
index 472635c170..a4d1571bdd 100644
--- a/Core/PixelEvent.swift
+++ b/Core/PixelEvent.swift
@@ -100,9 +100,14 @@ extension Pixel {
         case homeScreenEditFavorite
         case homeScreenDeleteFavorite
         
-        case autocompleteSelectedLocal
-        case autocompleteSelectedRemote
-        
+        case autocompleteEnabled
+        case autocompleteDisabled
+        case autocompleteClickPhrase
+        case autocompleteClickWebsite
+        case autocompleteClickBookmark
+        case autocompleteClickFavorite
+        case autocompleteClickHistory
+
         case feedbackPositive
         case feedbackNegativePrefix(category: String)
         
@@ -596,6 +601,11 @@ extension Pixel {
         case privacyProSubscriptionManagementEmail
         case privacyProSubscriptionManagementPlanBilling
         case privacyProSubscriptionManagementRemoval
+        // Web pixels
+        case privacyProOfferMonthlyPriceClick
+        case privacyProOfferYearlyPriceClick
+        case privacyProAddEmailSuccess
+        case privacyProWelcomeFAQClick
     }
     
 }
@@ -677,9 +687,14 @@ extension Pixel.Event {
         case .homeScreenEditFavorite: return "mh_ef"
         case .homeScreenDeleteFavorite: return "mh_df"
             
-        case .autocompleteSelectedLocal: return "m_au_l"
-        case .autocompleteSelectedRemote: return "m_au_r"
-            
+        case .autocompleteEnabled: return "m_autocomplete_toggled_on"
+        case .autocompleteDisabled: return "m_autocomplete_toggled_off"
+        case .autocompleteClickPhrase: return "m_autocomplete_click_phrase"
+        case .autocompleteClickWebsite: return "m_autocomplete_click_website"
+        case .autocompleteClickBookmark: return "m_autocomplete_click_bookmark"
+        case .autocompleteClickFavorite: return "m_autocomplete_click_favorite"
+        case .autocompleteClickHistory: return "m_autocomplete_click_history"
+
         case .feedbackPositive: return "mfbs_positive_submit"
         case .feedbackNegativePrefix(category: let category): return "mfbs_negative_\(category)"
             
@@ -1133,7 +1148,7 @@ extension Pixel.Event {
         case .historyInsertVisitFailed: return "m_debug_history-insert-visit-failed"
         case .historyRemoveVisitsFailed: return "m_debug_history-remove-visits-failed"
 
-            // MARK: Privacy pro
+        // MARK: Privacy pro
         case .privacyProSubscriptionActive: return "m_privacy-pro_app_subscription_active"
         case .privacyProOfferScreenImpression: return "m_privacy-pro_offer_screen_impression"
         case .privacyProPurchaseAttempt: return "m_privacy-pro_terms-conditions_subscribe_click"
@@ -1164,6 +1179,11 @@ extension Pixel.Event {
         case .privacyProSubscriptionManagementEmail: return "m_privacy-pro_manage-email_edit_click"
         case .privacyProSubscriptionManagementPlanBilling: return "m_privacy-pro_settings_change-plan-or-billing_click"
         case .privacyProSubscriptionManagementRemoval: return "m_privacy-pro_settings_remove-from-device_click"
+            // Web
+        case .privacyProOfferMonthlyPriceClick: return "m_privacy-pro_offer_monthly-price_click"
+        case .privacyProOfferYearlyPriceClick: return "m_privacy-pro_offer_yearly-price_click"
+        case .privacyProAddEmailSuccess: return "m_privacy-pro_app_add-email_success_u"
+        case .privacyProWelcomeFAQClick: return "m_privacy-pro_welcome_faq_click_u"
         }
     }
 }
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 57155c48ce..1fb2080c94 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -296,6 +296,8 @@
 		4BBBBA902B031B4200D965DA /* VPNWaitlist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBBBA8C2B031B4200D965DA /* VPNWaitlist.swift */; };
 		4BBBBA922B03291700D965DA /* VPNWaitlistUserText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBBBA912B03291700D965DA /* VPNWaitlistUserText.swift */; };
 		4BC21A2F27238B7500229F0E /* RunLoopExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BC21A2C272388BD00229F0E /* RunLoopExtensionTests.swift */; };
+		4BCBE45E2BA7E81F00FC75A1 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 4BCBE45D2BA7E81F00FC75A1 /* PrivacyInfo.xcprivacy */; };
+		4BCBE4602BA7E87100FC75A1 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 4BCBE45F2BA7E87100FC75A1 /* PrivacyInfo.xcprivacy */; };
 		4BCD14632B05AF2B000B1E4C /* NetworkProtectionAccessController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCD14622B05AF2B000B1E4C /* NetworkProtectionAccessController.swift */; };
 		4BCD14672B05B682000B1E4C /* NetworkProtectionTermsAndConditionsStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCD14662B05B682000B1E4C /* NetworkProtectionTermsAndConditionsStore.swift */; };
 		4BCD14692B05BDD5000B1E4C /* AppDelegate+Waitlists.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BCD14682B05BDD5000B1E4C /* AppDelegate+Waitlists.swift */; };
@@ -376,6 +378,7 @@
 		851CD674244D7E6000331B98 /* UserDefaultsExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85449F0023FEAF3000512AAF /* UserDefaultsExtension.swift */; };
 		851DFD87212C39D300D95F20 /* TabSwitcherButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 851DFD86212C39D300D95F20 /* TabSwitcherButton.swift */; };
 		851DFD8A212C5EE800D95F20 /* TabSwitcherButtonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 851DFD89212C5EE800D95F20 /* TabSwitcherButtonTests.swift */; };
+		851F74262B9A1BFD00747C42 /* Suggestions in Frameworks */ = {isa = PBXBuildFile; productRef = 851F74252B9A1BFD00747C42 /* Suggestions */; };
 		85200FA11FBC5BB5001AF290 /* DDGPersistenceContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85200FA01FBC5BB5001AF290 /* DDGPersistenceContainer.swift */; };
 		8521FDE6238D414B00A44CC3 /* FileStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8521FDE4238D411400A44CC3 /* FileStoreTests.swift */; };
 		8524AAAC2A3888FE00EEC6D2 /* Waitlist.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8524AAAB2A3888FE00EEC6D2 /* Waitlist.xcassets */; };
@@ -427,6 +430,7 @@
 		8551912724746EDC0010FDD0 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8551912624746EDC0010FDD0 /* SnapshotHelper.swift */; };
 		85582E0029D7409700E9AE35 /* SyncSettingsViewController+PDFRendering.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85582DFF29D7409700E9AE35 /* SyncSettingsViewController+PDFRendering.swift */; };
 		855D914D2063EF6A00C4B448 /* TabSwitcherTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 855D914C2063EF6A00C4B448 /* TabSwitcherTransition.swift */; };
+		8562CE152B9B645C00E1D399 /* CachedBookmarkSuggestions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8562CE142B9B645C00E1D399 /* CachedBookmarkSuggestions.swift */; };
 		8563A03C1F9288D600F04442 /* BrowserChromeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8563A03B1F9288D600F04442 /* BrowserChromeManager.swift */; };
 		8565A34B1FC8D96B00239327 /* LaunchTabNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8565A34A1FC8D96B00239327 /* LaunchTabNotification.swift */; };
 		8565A34D1FC8DFE400239327 /* LaunchTabNotificationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8565A34C1FC8DFE400239327 /* LaunchTabNotificationTests.swift */; };
@@ -503,7 +507,6 @@
 		85DFEDF724CB1CAB00973FE7 /* ShareSheet.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 85DFEDF624CB1CAB00973FE7 /* ShareSheet.xcassets */; };
 		85DFEDF924CF3D0E00973FE7 /* TabsBarCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85DFEDF824CF3D0E00973FE7 /* TabsBarCell.swift */; };
 		85E242172AB1B54D000F3E28 /* ReturnUserMeasurement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85E242162AB1B54D000F3E28 /* ReturnUserMeasurement.swift */; };
-		85E5603026541D9E00F4DC44 /* AutocompleteRequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85E5602E26541D1D00F4DC44 /* AutocompleteRequestTests.swift */; };
 		85E58C2C28FDA94F006A801A /* FavoritesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85E58C2B28FDA94F006A801A /* FavoritesViewController.swift */; };
 		85EE7F55224667DD000FE757 /* WebContainer.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 85EE7F54224667DD000FE757 /* WebContainer.storyboard */; };
 		85EE7F572246685B000FE757 /* WebContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85EE7F562246685B000FE757 /* WebContainerViewController.swift */; };
@@ -592,7 +595,6 @@
 		988AC355257E47C100793C64 /* RequeryLogic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 988AC354257E47C100793C64 /* RequeryLogic.swift */; };
 		988F3DCF237D5C0F00AEE34C /* SchemeHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 988F3DCE237D5C0F00AEE34C /* SchemeHandler.swift */; };
 		988F3DD3237DE8D900AEE34C /* ForgetDataAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 988F3DD2237DE8D900AEE34C /* ForgetDataAlert.swift */; };
-		98982B3422F8D8E400578AC9 /* Debounce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98982B3322F8D8E400578AC9 /* Debounce.swift */; };
 		98983096255B5019003339A2 /* BookmarksCachingSearchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98983095255B5019003339A2 /* BookmarksCachingSearchTests.swift */; };
 		98999D5922FDA41500CBBE1B /* BasicAuthenticationAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98999D5822FDA41500CBBE1B /* BasicAuthenticationAlert.swift */; };
 		989B337522D7EF2100437824 /* EmptyCollectionReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 989B337422D7EF2100437824 /* EmptyCollectionReusableView.swift */; };
@@ -711,6 +713,11 @@
 		BDA583892B98BA7600732FDC /* AccountManagerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA583862B98B6C700732FDC /* AccountManagerExtension.swift */; };
 		BDC234F72B27F51100D3C798 /* UniquePixel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDC234F62B27F51100D3C798 /* UniquePixel.swift */; };
 		BDD3B3552B8EF8DB005857A8 /* NetworkProtectionUNNotificationPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE3766DD2AC5945500AAB575 /* NetworkProtectionUNNotificationPresenter.swift */; };
+		BDFF031D2BA3D2BD00F324C9 /* DefaultNetworkProtectionVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDFF031C2BA3D2BD00F324C9 /* DefaultNetworkProtectionVisibility.swift */; };
+		BDFF03212BA3D3CF00F324C9 /* NetworkProtectionVisibilityForTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDFF03202BA3D3CF00F324C9 /* NetworkProtectionVisibilityForTunnelProvider.swift */; };
+		BDFF03222BA3D8E200F324C9 /* NetworkProtectionFeatureVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDFF03192BA39C5A00F324C9 /* NetworkProtectionFeatureVisibility.swift */; };
+		BDFF03232BA3D8E300F324C9 /* NetworkProtectionFeatureVisibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDFF03192BA39C5A00F324C9 /* NetworkProtectionFeatureVisibility.swift */; };
+		BDFF03262BA3DA4900F324C9 /* NetworkProtectionFeatureVisibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDFF03242BA3D92E00F324C9 /* NetworkProtectionFeatureVisibilityTests.swift */; };
 		C10CB5F32A1A5BDF0048E503 /* AutofillViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = C10CB5F22A1A5BDF0048E503 /* AutofillViews.swift */; };
 		C111B26927F579EF006558B1 /* BookmarkOrFolderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C111B26827F579EF006558B1 /* BookmarkOrFolderTests.swift */; };
 		C12726EE2A5FF88C00215B02 /* EmailSignupPromptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C12726ED2A5FF88C00215B02 /* EmailSignupPromptView.swift */; };
@@ -930,7 +937,6 @@
 		F176699F1E40BC86003D3222 /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F176699D1E40BC86003D3222 /* Settings.storyboard */; };
 		F17669D71E43401C003D3222 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F17669D61E43401C003D3222 /* MainViewController.swift */; };
 		F17843E91F36226700390DCD /* MockFiles in Resources */ = {isa = PBXBuildFile; fileRef = F17843E81F36226700390DCD /* MockFiles */; };
-		F17922DB1E717C8D006E3D97 /* Suggestion.swift in Sources */ = {isa = PBXBuildFile; fileRef = F17922DA1E717C8D006E3D97 /* Suggestion.swift */; };
 		F17922DE1E7192E6006E3D97 /* SuggestionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F17922DD1E7192E6006E3D97 /* SuggestionTableViewCell.swift */; };
 		F17922E01E71BB59006E3D97 /* AutocompleteViewControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F17922DF1E71BB59006E3D97 /* AutocompleteViewControllerDelegate.swift */; };
 		F17922E21E71CD67006E3D97 /* NoSuggestionsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F17922E11E71CD67006E3D97 /* NoSuggestionsTableViewCell.swift */; };
@@ -942,7 +948,6 @@
 		F194FAFB1F14E622009B4DF8 /* UIFontExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F194FAFA1F14E622009B4DF8 /* UIFontExtensionTests.swift */; };
 		F198D78E1E39762C0088DA8A /* StringExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F198D78D1E39762C0088DA8A /* StringExtensionTests.swift */; };
 		F198D7981E3A45D90088DA8A /* WKWebViewConfigurationExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F198D7971E3A45D90088DA8A /* WKWebViewConfigurationExtensionTests.swift */; };
-		F1A5683A1E70F98E0081082E /* AutocompleteRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A568391E70F98E0081082E /* AutocompleteRequest.swift */; };
 		F1A886781F29394E0096251E /* WebCacheManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A886771F29394E0096251E /* WebCacheManager.swift */; };
 		F1AE54E81F0425FC00D9A700 /* AuthenticationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1AE54E71F0425FC00D9A700 /* AuthenticationViewController.swift */; };
 		F1BE54581E69DE1000FCF649 /* TutorialSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1BE54571E69DE1000FCF649 /* TutorialSettings.swift */; };
@@ -1412,6 +1417,8 @@
 		4BBBBA8C2B031B4200D965DA /* VPNWaitlist.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VPNWaitlist.swift; sourceTree = "<group>"; };
 		4BBBBA912B03291700D965DA /* VPNWaitlistUserText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNWaitlistUserText.swift; sourceTree = "<group>"; };
 		4BC21A2C272388BD00229F0E /* RunLoopExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunLoopExtensionTests.swift; sourceTree = "<group>"; };
+		4BCBE45D2BA7E81F00FC75A1 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		4BCBE45F2BA7E87100FC75A1 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		4BCD14622B05AF2B000B1E4C /* NetworkProtectionAccessController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionAccessController.swift; sourceTree = "<group>"; };
 		4BCD14662B05B682000B1E4C /* NetworkProtectionTermsAndConditionsStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionTermsAndConditionsStore.swift; sourceTree = "<group>"; };
 		4BCD14682B05BDD5000B1E4C /* AppDelegate+Waitlists.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Waitlists.swift"; sourceTree = "<group>"; };
@@ -1542,6 +1549,7 @@
 		8551912624746EDC0010FDD0 /* SnapshotHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SnapshotHelper.swift; path = fastlane/SnapshotHelper.swift; sourceTree = SOURCE_ROOT; };
 		85582DFF29D7409700E9AE35 /* SyncSettingsViewController+PDFRendering.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SyncSettingsViewController+PDFRendering.swift"; sourceTree = "<group>"; };
 		855D914C2063EF6A00C4B448 /* TabSwitcherTransition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabSwitcherTransition.swift; sourceTree = "<group>"; };
+		8562CE142B9B645C00E1D399 /* CachedBookmarkSuggestions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CachedBookmarkSuggestions.swift; sourceTree = "<group>"; };
 		8563A03B1F9288D600F04442 /* BrowserChromeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserChromeManager.swift; sourceTree = "<group>"; };
 		8565A34A1FC8D96B00239327 /* LaunchTabNotification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchTabNotification.swift; sourceTree = "<group>"; };
 		8565A34C1FC8DFE400239327 /* LaunchTabNotificationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchTabNotificationTests.swift; sourceTree = "<group>"; };
@@ -1616,7 +1624,6 @@
 		85DFEDF624CB1CAB00973FE7 /* ShareSheet.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = ShareSheet.xcassets; sourceTree = "<group>"; };
 		85DFEDF824CF3D0E00973FE7 /* TabsBarCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsBarCell.swift; sourceTree = "<group>"; };
 		85E242162AB1B54D000F3E28 /* ReturnUserMeasurement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReturnUserMeasurement.swift; sourceTree = "<group>"; };
-		85E5602E26541D1D00F4DC44 /* AutocompleteRequestTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutocompleteRequestTests.swift; sourceTree = "<group>"; };
 		85E58C2B28FDA94F006A801A /* FavoritesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavoritesViewController.swift; sourceTree = "<group>"; };
 		85EE7F54224667DD000FE757 /* WebContainer.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = WebContainer.storyboard; sourceTree = "<group>"; };
 		85EE7F562246685B000FE757 /* WebContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebContainerViewController.swift; sourceTree = "<group>"; };
@@ -2205,7 +2212,6 @@
 		988F3DCE237D5C0F00AEE34C /* SchemeHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SchemeHandler.swift; sourceTree = "<group>"; };
 		988F3DD2237DE8D900AEE34C /* ForgetDataAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForgetDataAlert.swift; sourceTree = "<group>"; };
 		9896632322C56716007BE4FE /* EtagStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EtagStorage.swift; sourceTree = "<group>"; };
-		98982B3322F8D8E400578AC9 /* Debounce.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Debounce.swift; sourceTree = "<group>"; };
 		98983095255B5019003339A2 /* BookmarksCachingSearchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksCachingSearchTests.swift; sourceTree = "<group>"; };
 		98987E6E251EAC3B006F75CD /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		98987E70251EAC3B006F75CD /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -2366,6 +2372,10 @@
 		BD862E0A2B30F9300073E2EE /* VPNFeedbackFormView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNFeedbackFormView.swift; sourceTree = "<group>"; };
 		BDA583862B98B6C700732FDC /* AccountManagerExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountManagerExtension.swift; sourceTree = "<group>"; };
 		BDC234F62B27F51100D3C798 /* UniquePixel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UniquePixel.swift; sourceTree = "<group>"; };
+		BDFF03192BA39C5A00F324C9 /* NetworkProtectionFeatureVisibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionFeatureVisibility.swift; sourceTree = "<group>"; };
+		BDFF031C2BA3D2BD00F324C9 /* DefaultNetworkProtectionVisibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultNetworkProtectionVisibility.swift; sourceTree = "<group>"; };
+		BDFF03202BA3D3CF00F324C9 /* NetworkProtectionVisibilityForTunnelProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionVisibilityForTunnelProvider.swift; sourceTree = "<group>"; };
+		BDFF03242BA3D92E00F324C9 /* NetworkProtectionFeatureVisibilityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionFeatureVisibilityTests.swift; sourceTree = "<group>"; };
 		C10CB5F22A1A5BDF0048E503 /* AutofillViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillViews.swift; sourceTree = "<group>"; };
 		C111B26827F579EF006558B1 /* BookmarkOrFolderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkOrFolderTests.swift; sourceTree = "<group>"; };
 		C12726ED2A5FF88C00215B02 /* EmailSignupPromptView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailSignupPromptView.swift; sourceTree = "<group>"; };
@@ -2628,7 +2638,6 @@
 		F176699E1E40BC86003D3222 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Settings.storyboard; sourceTree = "<group>"; };
 		F17669D61E43401C003D3222 /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
 		F17843E81F36226700390DCD /* MockFiles */ = {isa = PBXFileReference; lastKnownFileType = folder; path = MockFiles; sourceTree = "<group>"; };
-		F17922DA1E717C8D006E3D97 /* Suggestion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Suggestion.swift; sourceTree = "<group>"; };
 		F17922DD1E7192E6006E3D97 /* SuggestionTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SuggestionTableViewCell.swift; sourceTree = "<group>"; };
 		F17922DF1E71BB59006E3D97 /* AutocompleteViewControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutocompleteViewControllerDelegate.swift; sourceTree = "<group>"; };
 		F17922E11E71CD67006E3D97 /* NoSuggestionsTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoSuggestionsTableViewCell.swift; sourceTree = "<group>"; };
@@ -2641,7 +2650,6 @@
 		F197EA3B1E6885F20029BDC1 /* TextFieldWithInsets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TextFieldWithInsets.swift; path = ../Core/TextFieldWithInsets.swift; sourceTree = "<group>"; };
 		F198D78D1E39762C0088DA8A /* StringExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringExtensionTests.swift; sourceTree = "<group>"; };
 		F198D7971E3A45D90088DA8A /* WKWebViewConfigurationExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WKWebViewConfigurationExtensionTests.swift; sourceTree = "<group>"; };
-		F1A568391E70F98E0081082E /* AutocompleteRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutocompleteRequest.swift; sourceTree = "<group>"; };
 		F1A886771F29394E0096251E /* WebCacheManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebCacheManager.swift; sourceTree = "<group>"; };
 		F1AA54601E48D90700223211 /* NotificationCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NotificationCenter.framework; path = System/Library/Frameworks/NotificationCenter.framework; sourceTree = SDKROOT; };
 		F1AE54E71F0425FC00D9A700 /* AuthenticationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthenticationViewController.swift; sourceTree = "<group>"; };
@@ -2817,6 +2825,7 @@
 				EE8E568A2A56BCE400F11DCA /* NetworkProtection in Frameworks */,
 				CBC83E3429B631780008E19C /* Configuration in Frameworks */,
 				D61CDA182B7CF78300A0FBB9 /* ZIPFoundation in Frameworks */,
+				851F74262B9A1BFD00747C42 /* Suggestions in Frameworks */,
 				98A16C2D28A11D6200A6C003 /* BrowserServicesKit in Frameworks */,
 				8599690F29D2F1C100DBF9FA /* DDGSync in Frameworks */,
 				851481882A600EFC00ABC65F /* RemoteMessaging in Frameworks */,
@@ -2854,6 +2863,7 @@
 				02025669298818B200E694E7 /* PacketTunnelProvider.entitlements */,
 				EEFC6A5F2AC0F2F80065027D /* UserText.swift */,
 				EEDFE2DC2AC6ED4F00F0E19C /* Localizable.strings */,
+				4BCBE45F2BA7E87100FC75A1 /* PrivacyInfo.xcprivacy */,
 			);
 			path = PacketTunnelProvider;
 			sourceTree = "<group>";
@@ -3587,6 +3597,7 @@
 				4BCD146A2B05C4B5000B1E4C /* VPNWaitlistTermsAndConditionsViewController.swift */,
 				4B78074B2B1823C5009DB2CF /* VPNWaitlistActivationDateStore.swift */,
 				4B78074D2B183A1F009DB2CF /* SurveyURLBuilder.swift */,
+				BDFF031F2BA3D3AD00F324C9 /* Feature Visibility */,
 			);
 			name = VPN;
 			sourceTree = "<group>";
@@ -3855,6 +3866,7 @@
 			isa = PBXGroup;
 			children = (
 				8512EA5624ED30D30073EE19 /* Assets.xcassets */,
+				4BCBE45D2BA7E81F00FC75A1 /* PrivacyInfo.xcprivacy */,
 				853273AC24FEF49600E3C778 /* ColorExtension.swift */,
 				853273B124FF114700E3C778 /* DeepLinks.swift */,
 				8512EA5824ED30D30073EE19 /* Info.plist */,
@@ -4133,14 +4145,6 @@
 			name = iPad;
 			sourceTree = "<group>";
 		};
-		85E5602D26541D0900F4DC44 /* AutoComplete */ = {
-			isa = PBXGroup;
-			children = (
-				85E5602E26541D1D00F4DC44 /* AutocompleteRequestTests.swift */,
-			);
-			name = AutoComplete;
-			sourceTree = "<group>";
-		};
 		85EE7F53224667C3000FE757 /* WebContainer */ = {
 			isa = PBXGroup;
 			children = (
@@ -4436,6 +4440,16 @@
 			name = Subscription;
 			sourceTree = "<group>";
 		};
+		BDFF031F2BA3D3AD00F324C9 /* Feature Visibility */ = {
+			isa = PBXGroup;
+			children = (
+				BDFF03192BA39C5A00F324C9 /* NetworkProtectionFeatureVisibility.swift */,
+				BDFF031C2BA3D2BD00F324C9 /* DefaultNetworkProtectionVisibility.swift */,
+				BDFF03202BA3D3CF00F324C9 /* NetworkProtectionVisibilityForTunnelProvider.swift */,
+			);
+			name = "Feature Visibility";
+			sourceTree = "<group>";
+		};
 		C14882D627F2010700D59F0C /* ImportExport */ = {
 			isa = PBXGroup;
 			children = (
@@ -4824,6 +4838,7 @@
 				EE41BD182A729E9C00546C57 /* NetworkProtectionInviteViewModelTests.swift */,
 				4BCD146C2B05DB09000B1E4C /* NetworkProtectionAccessControllerTests.swift */,
 				EEC02C152B065BE00045CE11 /* NetworkProtectionVPNLocationViewModelTests.swift */,
+				BDFF03242BA3D92E00F324C9 /* NetworkProtectionFeatureVisibilityTests.swift */,
 			);
 			name = NetworkProtection;
 			sourceTree = "<group>";
@@ -5002,7 +5017,6 @@
 				F17669A21E411D63003D3222 /* Application */,
 				026F08B629B7DC130079B9DF /* AppTrackingProtection */,
 				981FED7222045FFA008488D7 /* AutoClear */,
-				85E5602D26541D0900F4DC44 /* AutoComplete */,
 				1E1D8B5B2994FF7800C96994 /* Autoconsent */,
 				F40F843228C92B1C0081AE75 /* Autofill */,
 				98559FD0267099F400A83094 /* ContentBlocker */,
@@ -5175,7 +5189,6 @@
 				F143C3251E4A9A0E00CFDE3A /* URLExtension.swift */,
 				1E4DCF4B27B6A4CB00961E25 /* URLFileExtension.swift */,
 				F1075C911E9EF827006BE8A8 /* UserDefaultsExtension.swift */,
-				98982B3322F8D8E400578AC9 /* Debounce.swift */,
 				1CB7B82023CEA1F800AA24EA /* DateExtension.swift */,
 				1E8AD1DA27C51AE000ABA377 /* TimeIntervalExtension.swift */,
 				85449EFA23FDA0BC00512AAF /* UserDefaultsPropertyWrapper.swift */,
@@ -5208,8 +5221,6 @@
 		F15D43211E70849A00BF2CDC /* Autocomplete */ = {
 			isa = PBXGroup;
 			children = (
-				F17922D31E7109C4006E3D97 /* API */,
-				F17922DC1E717C91006E3D97 /* Domain */,
 				F17922D41E7109DB006E3D97 /* UI */,
 			);
 			name = Autocomplete;
@@ -5262,14 +5273,6 @@
 			name = Mocks;
 			sourceTree = "<group>";
 		};
-		F17922D31E7109C4006E3D97 /* API */ = {
-			isa = PBXGroup;
-			children = (
-				F1A568391E70F98E0081082E /* AutocompleteRequest.swift */,
-			);
-			name = API;
-			sourceTree = "<group>";
-		};
 		F17922D41E7109DB006E3D97 /* UI */ = {
 			isa = PBXGroup;
 			children = (
@@ -5278,18 +5281,11 @@
 				F17922DF1E71BB59006E3D97 /* AutocompleteViewControllerDelegate.swift */,
 				F17922E11E71CD67006E3D97 /* NoSuggestionsTableViewCell.swift */,
 				F17922DD1E7192E6006E3D97 /* SuggestionTableViewCell.swift */,
+				8562CE142B9B645C00E1D399 /* CachedBookmarkSuggestions.swift */,
 			);
 			name = UI;
 			sourceTree = "<group>";
 		};
-		F17922DC1E717C91006E3D97 /* Domain */ = {
-			isa = PBXGroup;
-			children = (
-				F17922DA1E717C8D006E3D97 /* Suggestion.swift */,
-			);
-			name = Domain;
-			sourceTree = "<group>";
-		};
 		F17D722C1E8B3563003E8B0E /* Domain */ = {
 			isa = PBXGroup;
 			children = (
@@ -5964,6 +5960,7 @@
 				D61CDA152B7CF77300A0FBB9 /* Subscription */,
 				D61CDA172B7CF78300A0FBB9 /* ZIPFoundation */,
 				858D009C2B9799FC004E5B4C /* History */,
+				851F74252B9A1BFD00747C42 /* Suggestions */,
 			);
 			productName = Core;
 			productReference = F143C2E41E4A4CD400CFDE3A /* Core.framework */;
@@ -6117,6 +6114,7 @@
 			files = (
 				0262085C2A37915D006CB755 /* ios_blocklist_075.json in Resources */,
 				CB1143DE2AF6D4B600C1CCD3 /* InfoPlist.strings in Resources */,
+				4BCBE4602BA7E87100FC75A1 /* PrivacyInfo.xcprivacy in Resources */,
 				EEDFE2DA2AC6ED4F00F0E19C /* Localizable.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -6280,6 +6278,7 @@
 				8512EA9D24EEA6820073EE19 /* Assets.xcassets in Resources */,
 				98B001AA251EABB40090EC07 /* Localizable.strings in Resources */,
 				98B001A4251EABB40090EC07 /* InfoPlist.strings in Resources */,
+				4BCBE45E2BA7E81F00FC75A1 /* PrivacyInfo.xcprivacy in Resources */,
 				8512EA5724ED30D30073EE19 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -6464,6 +6463,7 @@
 			files = (
 				02025B0D29884D2C00E694E7 /* AppTrackerData.swift in Sources */,
 				4BEF656C2989C2FC00B650CB /* TunnelEvent.swift in Sources */,
+				BDFF03232BA3D8E300F324C9 /* NetworkProtectionFeatureVisibility.swift in Sources */,
 				02025A9A2988229800E694E7 /* TUNInterface.swift in Sources */,
 				02025A9B2988229800E694E7 /* IPStackProtocol.swift in Sources */,
 				02025AA32988229800E694E7 /* PacketProtocolParser.swift in Sources */,
@@ -6521,6 +6521,7 @@
 				02025AEC2988229800E694E7 /* AppTrackingProtectionPacketTunnelProvider.swift in Sources */,
 				02025B1029884DC500E694E7 /* AppTrackerDataParser.swift in Sources */,
 				4BB697A52B1D99C5003699B5 /* VPNWaitlistActivationDateStore.swift in Sources */,
+				BDFF03212BA3D3CF00F324C9 /* NetworkProtectionVisibilityForTunnelProvider.swift in Sources */,
 				EEFC6A602AC0F2F80065027D /* UserText.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -6584,6 +6585,7 @@
 				F4E1936625AF722F001D2666 /* HighlightCutOutView.swift in Sources */,
 				1E162605296840D80004127F /* Triangle.swift in Sources */,
 				B609D5522862EAFF0088CAC2 /* InlineWKDownloadDelegate.swift in Sources */,
+				BDFF03222BA3D8E200F324C9 /* NetworkProtectionFeatureVisibility.swift in Sources */,
 				B652DEFD287BE67400C12A9C /* UserScripts.swift in Sources */,
 				31DD208427395A5A008FB313 /* VoiceSearchHelper.swift in Sources */,
 				9874F9EE2187AFCE00CAF33D /* Themable.swift in Sources */,
@@ -6626,6 +6628,7 @@
 				853C5F6121C277C7001F7A05 /* global.swift in Sources */,
 				EE9D68D82AE15AD600B55EF4 /* UIApplicationExtension.swift in Sources */,
 				F13B4BD31F1822C700814661 /* Tab.swift in Sources */,
+				BDFF031D2BA3D2BD00F324C9 /* DefaultNetworkProtectionVisibility.swift in Sources */,
 				F1BE54581E69DE1000FCF649 /* TutorialSettings.swift in Sources */,
 				1EE52ABB28FB1D6300B750C1 /* UIImageExtension.swift in Sources */,
 				858650D12469BCDE00C36F8A /* DaxDialogs.swift in Sources */,
@@ -6846,7 +6849,6 @@
 				0268FC132A449F04000EE6A2 /* OnboardingContainerView.swift in Sources */,
 				858650D9246B0D3C00C36F8A /* DaxOnboardingViewController.swift in Sources */,
 				312E5746283BB04A00C18FA0 /* AutofillEmptySearchView.swift in Sources */,
-				F1A5683A1E70F98E0081082E /* AutocompleteRequest.swift in Sources */,
 				8565A34B1FC8D96B00239327 /* LaunchTabNotification.swift in Sources */,
 				0290472829E861BE0008FE3C /* AppTPTrackerDetailViewModel.swift in Sources */,
 				311BD1AD2836BB3900AEF6C1 /* AutofillItemsEmptyView.swift in Sources */,
@@ -6913,8 +6915,8 @@
 				851624C72B96389D002D5CD7 /* HistoryDebugViewController.swift in Sources */,
 				8540BBA22440857A00017FE4 /* PreserveLoginsWorker.swift in Sources */,
 				85DFEDF924CF3D0E00973FE7 /* TabsBarCell.swift in Sources */,
-				F17922DB1E717C8D006E3D97 /* Suggestion.swift in Sources */,
 				020108A729A6ABF600644F9D /* AppTPToggleView.swift in Sources */,
+				8562CE152B9B645C00E1D399 /* CachedBookmarkSuggestions.swift in Sources */,
 				02A54A982A093126000C8FED /* AppTPHomeViewModel.swift in Sources */,
 				C13F3F682B7F88100083BE40 /* AuthConfirmationPromptView.swift in Sources */,
 				F1617C191E573EA800DEDCAF /* TabSwitcherDelegate.swift in Sources */,
@@ -7055,7 +7057,6 @@
 				31C138B227A4097800FFD4B2 /* DownloadTestsHelper.swift in Sources */,
 				1E1D8B5D2994FFE100C96994 /* AutoconsentMessageProtocolTests.swift in Sources */,
 				85C11E532090B23A00BFFEB4 /* UserDefaultsHomeRowReminderStorageTests.swift in Sources */,
-				85E5603026541D9E00F4DC44 /* AutocompleteRequestTests.swift in Sources */,
 				F1DA2F7D1EBCF23700313F51 /* ExternalUrlSchemeTests.swift in Sources */,
 				F198D78E1E39762C0088DA8A /* StringExtensionTests.swift in Sources */,
 				31B1FA87286EFC5C00CA3C1C /* XCTestCaseExtension.swift in Sources */,
@@ -7074,6 +7075,7 @@
 				850559D223CF710C0055C0D5 /* WebCacheManagerTests.swift in Sources */,
 				EEC02C162B065BE00045CE11 /* NetworkProtectionVPNLocationViewModelTests.swift in Sources */,
 				987130C5294AAB9F00AB05E0 /* BookmarkEditorViewModelTests.swift in Sources */,
+				BDFF03262BA3DA4900F324C9 /* NetworkProtectionFeatureVisibilityTests.swift in Sources */,
 				8341D807212D5E8D000514C2 /* HashExtensionTest.swift in Sources */,
 				C1D21E2F293A599C006E5A05 /* AutofillLoginSessionTests.swift in Sources */,
 				85D2187924BF6B8B004373D2 /* FaviconSourcesProviderTests.swift in Sources */,
@@ -7251,7 +7253,6 @@
 				37E615752A5F533E00ACD63D /* SyncCredentialsAdapter.swift in Sources */,
 				02CA904B24F6C11A00D41DDF /* NavigatorSharePatchUserScript.swift in Sources */,
 				85BDC3192436161C0053DB07 /* LoginFormDetectionUserScript.swift in Sources */,
-				98982B3422F8D8E400578AC9 /* Debounce.swift in Sources */,
 				37DF000A29F9C416002B7D3E /* SyncMetadataDatabase.swift in Sources */,
 				F143C3291E4A9A0E00CFDE3A /* URLExtension.swift in Sources */,
 				F143C3271E4A9A0E00CFDE3A /* Logging.swift in Sources */,
@@ -10190,6 +10191,11 @@
 			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = RemoteMessaging;
 		};
+		851F74252B9A1BFD00747C42 /* Suggestions */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
+			productName = Suggestions;
+		};
 		85875B6029912A9900115F05 /* SyncUI */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = SyncUI;
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 1b17628fd5..24ebd30421 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -140,8 +140,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
-        "revision" : "c8ed701b513cf5177118a175d85fbbbcd707ab41",
-        "version" : "1.3.0"
+        "revision" : "46989693916f56d1186bd59ac15124caef896560",
+        "version" : "1.3.1"
       }
     },
     {
@@ -183,7 +183,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"
diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo.xcscheme
index e564636928..d3926becad 100644
--- a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo.xcscheme
+++ b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo.xcscheme
@@ -124,7 +124,7 @@
          <EnvironmentVariable
             key = "VARIANT"
             value = "md"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </EnvironmentVariable>
          <EnvironmentVariable
             key = "ONBOARDING"
diff --git a/DuckDuckGo/AppDelegate+Waitlists.swift b/DuckDuckGo/AppDelegate+Waitlists.swift
index 7fae089578..5d58408534 100644
--- a/DuckDuckGo/AppDelegate+Waitlists.swift
+++ b/DuckDuckGo/AppDelegate+Waitlists.swift
@@ -37,7 +37,9 @@ extension AppDelegate {
     func checkWaitlists() {
 
 #if NETWORK_PROTECTION
-        checkNetworkProtectionWaitlist()
+        if vpnFeatureVisibilty.shouldKeepVPNAccessViaWaitlist() {
+            checkNetworkProtectionWaitlist()
+        }
 #endif
         checkWaitlistBackgroundTasks()
 
@@ -93,6 +95,8 @@ extension AppDelegate {
 #endif
 
     private func checkWaitlistBackgroundTasks() {
+        guard vpnFeatureVisibilty.shouldKeepVPNAccessViaWaitlist() else { return }
+
         BGTaskScheduler.shared.getPendingTaskRequests { tasks in
 
 #if NETWORK_PROTECTION
diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
index ec4aedf063..7348724343 100644
--- a/DuckDuckGo/AppDelegate.swift
+++ b/DuckDuckGo/AppDelegate.swift
@@ -75,6 +75,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 #if NETWORK_PROTECTION
     private let widgetRefreshModel = NetworkProtectionWidgetRefreshModel()
     private let tunnelDefaults = UserDefaults.networkProtectionGroupDefaults
+    lazy var vpnFeatureVisibilty = DefaultNetworkProtectionVisibility()
 #endif
 
     private var autoClear: AutoClear?
@@ -303,7 +304,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         AppConfigurationFetch.registerBackgroundRefreshTaskHandler()
 
 #if NETWORK_PROTECTION
-        VPNWaitlist.shared.registerBackgroundRefreshTaskHandler()
+        if vpnFeatureVisibilty.shouldKeepVPNAccessViaWaitlist() {
+            VPNWaitlist.shared.registerBackgroundRefreshTaskHandler()
+        }
 #endif
 
         RemoteMessaging.registerBackgroundRefreshTaskHandler(
@@ -332,7 +335,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         setupSubscriptionsEnvironment()
 #endif
 
-        clearDebugWaitlistState()
+        if vpnFeatureVisibilty.shouldKeepVPNAccessViaWaitlist() {
+            clearDebugWaitlistState()
+        }
 
         AppDependencyProvider.shared.toggleProtectionsCounter.sendEventsIfNeeded()
         AppDependencyProvider.shared.userBehaviorMonitor.handleAction(.reopenApp)
@@ -385,7 +390,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         }
     }
 
-    private func presentExpiredEntitlementNotification() {
+    private func presentExpiredEntitlementNotificationIfNeeded() {
         let presenter = NetworkProtectionNotificationsPresenterTogglableDecorator(
             settings: VPNSettings(defaults: .networkProtectionGroupDefaults),
             defaults: .networkProtectionGroupDefaults,
@@ -393,6 +398,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         )
         presenter.showEntitlementNotification()
     }
+
+    private func presentVPNEarlyAccessOverAlert() {
+        let alertController = CriticalAlerts.makeVPNEarlyAccessOverAlert()
+        window?.rootViewController?.present(alertController, animated: true) { [weak self] in
+            self?.tunnelDefaults.vpnEarlyAccessOverAlertAlreadyShown = true
+        }
+    }
 #endif
 
     private func cleanUpMacPromoExperiment2() {
@@ -417,6 +429,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     private func setupSubscriptionsEnvironment() {
         Task {
             SubscriptionPurchaseEnvironment.currentServiceEnvironment = .staging
+#if NETWORK_PROTECTION
+            if VPNSettings(defaults: .networkProtectionGroupDefaults).selectedEnvironment == .staging {
+                SubscriptionPurchaseEnvironment.currentServiceEnvironment = .staging
+            }
+#endif
             SubscriptionPurchaseEnvironment.current = .appStore
             await AccountManager().checkSubscriptionState()
         }
@@ -474,11 +491,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 #if NETWORK_PROTECTION
         widgetRefreshModel.refreshVPNWidget()
 
+        if vpnFeatureVisibilty.shouldShowThankYouMessaging() && !tunnelDefaults.vpnEarlyAccessOverAlertAlreadyShown {
+            presentVPNEarlyAccessOverAlert()
+        }
+
         if tunnelDefaults.showEntitlementAlert {
             presentExpiredEntitlementAlert()
         }
 
-        presentExpiredEntitlementNotification()
+        presentExpiredEntitlementNotificationIfNeeded()
 #endif
 
         updateSubscriptionStatus()
@@ -830,7 +851,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func refreshShortcuts() {
 #if NETWORK_PROTECTION
-        guard NetworkProtectionKeychainTokenStore().isFeatureActivated else {
+        guard vpnFeatureVisibilty.shouldShowVPNShortcut() else {
+            UIApplication.shared.shortcutItems = nil
             return
         }
 
@@ -906,10 +928,11 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
                 presentNetworkProtectionStatusSettingsModal()
             }
 
-            if identifier == VPNWaitlist.notificationIdentifier {
+            if vpnFeatureVisibilty.shouldKeepVPNAccessViaWaitlist(), identifier == VPNWaitlist.notificationIdentifier {
                 presentNetworkProtectionWaitlistModal()
                 DailyPixel.fire(pixel: .networkProtectionWaitlistNotificationLaunched)
             }
+
 #endif
         }
 
diff --git a/DuckDuckGo/AppDependencyProvider.swift b/DuckDuckGo/AppDependencyProvider.swift
index c928b90ed5..8a1361cfef 100644
--- a/DuckDuckGo/AppDependencyProvider.swift
+++ b/DuckDuckGo/AppDependencyProvider.swift
@@ -22,6 +22,7 @@ import Core
 import BrowserServicesKit
 import DDGSync
 import Bookmarks
+import Subscription
 
 protocol DependencyProvider {
 
@@ -39,6 +40,7 @@ protocol DependencyProvider {
     var configurationManager: ConfigurationManager { get }
     var toggleProtectionsCounter: ToggleProtectionsCounter { get }
     var userBehaviorMonitor: UserBehaviorMonitor { get }
+    var subscriptionFeatureAvailability: SubscriptionFeatureAvailability { get }
 
 }
 
@@ -68,5 +70,9 @@ class AppDependencyProvider: DependencyProvider {
 
     let toggleProtectionsCounter: ToggleProtectionsCounter = ContentBlocking.shared.privacyConfigurationManager.toggleProtectionsCounter
     let userBehaviorMonitor = UserBehaviorMonitor()
+    
+    let subscriptionFeatureAvailability: SubscriptionFeatureAvailability = DefaultSubscriptionFeatureAvailability(
+        privacyConfigurationManager: ContentBlocking.shared.privacyConfigurationManager,
+        purchasePlatform: .appStore)
 
 }
diff --git a/DuckDuckGo/AutocompleteRequest.swift b/DuckDuckGo/AutocompleteRequest.swift
deleted file mode 100644
index ab17ef62f6..0000000000
--- a/DuckDuckGo/AutocompleteRequest.swift
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-//  AutocompleteRequest.swift
-//  DuckDuckGo
-//
-//  Copyright © 2017 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import Foundation
-import Core
-import Networking
-
-class AutocompleteRequest {
-    
-    enum Error: Swift.Error {
-        
-        case noData
-        
-    }
-
-    private static let session = URLSession(configuration: .ephemeral)
-    
-    typealias Completion = ([Suggestion]?, Swift.Error?) -> Void
-
-    private let url: URL
-    private var task: URLSessionDataTask?
-
-    init(query: String) throws {
-        self.url = try URL.makeAutocompleteURL(for: query)
-    }
-
-    func execute(completion: @escaping Completion) {
-        var request = URLRequest.developerInitiated(url)
-        request.allHTTPHeaderFields = APIRequest.Headers().httpHeaders
-
-        task = AutocompleteRequest.session.dataTask(with: request) { [weak self] (data, _, error) in
-            guard let weakSelf = self else { return }
-            do {
-                let suggestions = try weakSelf.processResult(data: data, error: error)
-                weakSelf.complete(completion, withSuccess: suggestions)
-            } catch {
-                weakSelf.complete(completion, withError: error)
-            }
-        }
-        task?.resume()
-    }
-
-    private func processResult(data: Data?, error: Swift.Error?) throws -> [Suggestion] {
-        if let error = error { throw error }
-        guard let data = data else { throw Error.noData }
-        let entries = try JSONDecoder().decode([AutocompleteEntry].self, from: data)
-
-        return entries.compactMap {
-            guard let phrase = $0.phrase else { return nil }
-
-            if let isNav = $0.isNav {
-                // We definitely have a nav indication so use it. Phrase should be a fully qualified URL.
-                //  Assume HTTP and that we'll auto-upgrade if needed.
-                let url = isNav ? URL(string: "http://\(phrase)") : nil
-                return Suggestion(source: .remote, suggestion: phrase, url: url)
-            } else {
-                // We need to infer nav based on the phrase to maintain previous behaviour (ie treat phrase that look like URLs like URLs)
-                let url = URL.webUrl(from: phrase)
-                return Suggestion(source: .remote, suggestion: phrase, url: url)
-            }
-        }
-    }
-
-    private func complete(_ completion: @escaping Completion, withSuccess suggestions: [Suggestion]) {
-        DispatchQueue.main.async {
-            completion(suggestions, nil)
-        }
-    }
-
-    private func complete(_ completion: @escaping Completion, withError error: Swift.Error) {
-        DispatchQueue.main.async {
-            completion(nil, error)
-        }
-    }
-
-    func cancel() {
-        task?.cancel()
-    }
-}
diff --git a/DuckDuckGo/AutocompleteViewController.swift b/DuckDuckGo/AutocompleteViewController.swift
index caa9e5b35a..8f57da2bb2 100644
--- a/DuckDuckGo/AutocompleteViewController.swift
+++ b/DuckDuckGo/AutocompleteViewController.swift
@@ -21,29 +21,42 @@ import Common
 import UIKit
 import Core
 import DesignResourcesKit
+import Suggestions
+import Networking
+import CoreData
+import Persistence
+import History
+import Combine
 
 class AutocompleteViewController: UIViewController {
     
+    private static let session = URLSession(configuration: .ephemeral)
+
     struct Constants {
-        static let debounceDelay: TimeInterval = 0.1
+        static let debounceDelay = 100 // millis
         static let minItems = 1
-        static let maxLocalItems = 2
     }
 
     weak var delegate: AutocompleteViewControllerDelegate?
     weak var presentationDelegate: AutocompleteViewControllerPresentationDelegate?
 
-    private var lastRequest: AutocompleteRequest?
+    private var task: URLSessionDataTask?
+    private var loader: SuggestionLoading?
     private var receivedResponse = false
     private var pendingRequest = false
     
-    fileprivate var query = ""
+    @Published fileprivate var query = ""
+    fileprivate var queryDebounceCancellable: AnyCancellable?
+
     fileprivate var suggestions = [Suggestion]()
     fileprivate var selectedItem = -1
     
-    private var bookmarksSearch: BookmarksStringSearch!
-
+    private var historyCoordinator: HistoryCoordinating!
+    private var bookmarksDatabase: CoreDataDatabase!
     private var appSettings: AppSettings!
+    private lazy var cachedBookmarks: CachedBookmarks = {
+        CachedBookmarks(bookmarksDatabase)
+    }()
 
     var backgroundColor: UIColor {
         appSettings.currentAddressBarPosition.isBottom ?
@@ -63,20 +76,19 @@ class AutocompleteViewController: UIViewController {
     }
 
     private var hidesBarsOnSwipeDefault = true
-    
-    private let debounce = Debounce(queue: .main, seconds: Constants.debounceDelay)
 
     @IBOutlet weak var tableView: UITableView!
     var shouldOffsetY = false
     
-    static func loadFromStoryboard(bookmarksSearch: BookmarksStringSearch,
+    static func loadFromStoryboard(bookmarksDatabase: CoreDataDatabase,
+                                   historyCoordinator: HistoryCoordinating,
                                    appSettings: AppSettings = AppDependencyProvider.shared.appSettings) -> AutocompleteViewController {
         let storyboard = UIStoryboard(name: "Autocomplete", bundle: nil)
-
         guard let controller = storyboard.instantiateInitialViewController() as? AutocompleteViewController else {
             fatalError("Failed to instatiate correct Autocomplete view controller")
         }
-        controller.bookmarksSearch = bookmarksSearch
+        controller.bookmarksDatabase = bookmarksDatabase
+        controller.historyCoordinator = historyCoordinator
         controller.appSettings = appSettings
         return controller
     }
@@ -85,6 +97,12 @@ class AutocompleteViewController: UIViewController {
         super.viewDidLoad()
         configureTableView()
         applyTheme(ThemeManager.shared.currentTheme)
+
+        queryDebounceCancellable = $query
+            .debounce(for: .milliseconds(Constants.debounceDelay), scheduler: RunLoop.main)
+            .sink { [weak self] query in
+                self?.requestSuggestions(query: query)
+            }
     }
     
     private func configureTableView() {
@@ -125,24 +143,29 @@ class AutocompleteViewController: UIViewController {
     }
 
     func updateQuery(query: String) {
-        self.query = query
         selectedItem = -1
         cancelInFlightRequests()
-        debounce.schedule { [weak self] in
-            self?.requestSuggestions(query: query)
-        }
+        self.query = query
     }
     
     func willDismiss(with query: String) {
-        guard selectedItem != -1, selectedItem < suggestions.count else { return }
-        
+        guard suggestions.indices.contains(selectedItem) else { return }
         let suggestion = suggestions[selectedItem]
-        if let url = suggestion.url {
-            if query == url.absoluteString {
-                firePixel(selectedSuggestion: suggestion)
-            }
-        } else if query == suggestion.suggestion {
-            firePixel(selectedSuggestion: suggestion)
+        firePixelForSelectedSuggestion(suggestion)
+    }
+
+    private func firePixelForSelectedSuggestion(_ suggestion: Suggestion) {
+        switch suggestion {
+        case .phrase:
+            Pixel.fire(pixel: .autocompleteClickPhrase)
+        case .website:
+            Pixel.fire(pixel: .autocompleteClickWebsite)
+        case .bookmark(_, _, isFavorite: let isFavorite, _):
+            Pixel.fire(pixel: isFavorite ? .autocompleteClickFavorite : .autocompleteClickBookmark)
+        case .historyEntry:
+            Pixel.fire(pixel: .autocompleteClickHistory)
+        case .unknown(value: let value):
+            assertionFailure("Unknown suggestion \(value)")
         }
     }
 
@@ -152,47 +175,32 @@ class AutocompleteViewController: UIViewController {
     }
 
     private func cancelInFlightRequests() {
-        if let inFlightRequest = lastRequest {
-            inFlightRequest.cancel()
-            lastRequest = nil
-        }
+        task?.cancel()
+        task = nil
     }
 
     private func requestSuggestions(query: String) {
         selectedItem = -1
         tableView.reloadData()
-        do {
-            lastRequest = try AutocompleteRequest(query: query)
-            pendingRequest = true
-        } catch {
-            os_log("Couldn‘t form AutocompleteRequest for query “%s”: %s", log: .lifecycleLog, type: .debug, query, error.localizedDescription)
-            lastRequest = nil
-            pendingRequest = false
-            return
-        }
 
-        lastRequest!.execute { [weak self] (suggestions, error) in
-            guard let strongSelf = self else { return }
-
-            Task { @MainActor in
-                let matches = strongSelf.bookmarksSearch.search(query: query)
-                let notQueryMatches = matches.filter { $0.url.absoluteString != query }
-                let filteredMatches = notQueryMatches.prefix(Constants.maxLocalItems)
-                let localSuggestions = filteredMatches.map { Suggestion(source: .local,
-                                                                        suggestion: $0.title,
-                                                                        url: $0.url)
-                }
-
-                guard let suggestions = suggestions, error == nil else {
-                    os_log("%s", log: .generalLog, type: .debug, error?.localizedDescription ?? "Failed to retrieve suggestions")
-                    self?.updateSuggestions(localSuggestions)
-                    return
-                }
-
-                let combinedSuggestions = localSuggestions + suggestions
-                strongSelf.updateSuggestions(Array(combinedSuggestions))
-                strongSelf.pendingRequest = false
+        loader = SuggestionLoader(dataSource: self, urlFactory: { phrase in
+            guard let url = URL(trimmedAddressBarString: phrase),
+                  let scheme = url.scheme,
+                  scheme.description.hasPrefix("http"),
+                  url.isValid else {
+                return nil
+            }
+
+            return url
+        })
+        pendingRequest = true
+
+        loader?.getSuggestions(query: query) { [weak self] result, error in
+            defer {
+                self?.pendingRequest = false
             }
+            guard error == nil else { return }
+            self?.updateSuggestions(result?.all ?? [])
         }
     }
 
@@ -262,37 +270,29 @@ extension AutocompleteViewController: UITableViewDataSource {
         if appSettings.currentAddressBarPosition.isBottom && suggestions.isEmpty {
             return view.frame.height
         }
-        return 46
+
+        let defaultHeight: CGFloat = 46
+        guard suggestions.indices.contains(indexPath.row) else { return defaultHeight }
+
+        switch suggestions[indexPath.row] {
+        case .bookmark, .historyEntry:
+            return 60
+        default:
+            return defaultHeight
+        }
     }
 
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return receivedResponse ? max(Constants.minItems, suggestions.count) : 0
     }
-    
-    private func firePixel(selectedSuggestion: Suggestion) {
-        let resultsIncludeBookmarks: Bool
-        if let firstSuggestion = suggestions.first {
-            resultsIncludeBookmarks = firstSuggestion.source == .local
-        } else {
-            resultsIncludeBookmarks = false
-        }
-        
-        let params = [PixelParameters.autocompleteBookmarkCapable: bookmarksSearch.hasData ? "true" : "false",
-                      PixelParameters.autocompleteIncludedLocalResults: resultsIncludeBookmarks ? "true" : "false"]
-        
-        if selectedSuggestion.source == .local {
-            Pixel.fire(pixel: .autocompleteSelectedLocal, withAdditionalParameters: params)
-        } else {
-            Pixel.fire(pixel: .autocompleteSelectedRemote, withAdditionalParameters: params)
-        }
-    }
+
 }
 
 extension AutocompleteViewController: UITableViewDelegate {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let suggestion = suggestions[indexPath.row]
-        firePixel(selectedSuggestion: suggestion)
         delegate?.autocomplete(selectedSuggestion: suggestion)
+        firePixelForSelectedSuggestion(suggestion)
     }
 }
 
@@ -334,3 +334,37 @@ extension AutocompleteViewController {
     }
 
 }
+
+extension AutocompleteViewController: SuggestionLoadingDataSource {
+    
+    func history(for suggestionLoading: Suggestions.SuggestionLoading) -> [HistorySuggestion] {
+        return historyCoordinator.history ?? []
+    }
+
+    func bookmarks(for suggestionLoading: Suggestions.SuggestionLoading) -> [Suggestions.Bookmark] {
+        return cachedBookmarks.all
+    }
+
+    func suggestionLoading(_ suggestionLoading: Suggestions.SuggestionLoading, suggestionDataFromUrl url: URL, withParameters parameters: [String: String], completion: @escaping (Data?, Error?) -> Void) {
+        var queryURL = url
+        parameters.forEach {
+            queryURL = queryURL.appendingParameter(name: $0.key, value: $0.value)
+        }
+
+        var request = URLRequest.developerInitiated(queryURL)
+        request.allHTTPHeaderFields = APIRequest.Headers().httpHeaders
+        task = Self.session.dataTask(with: request) { data, _, error in
+            completion(data, error)
+        }
+        task?.resume()
+    }
+
+}
+
+extension HistoryEntry: HistorySuggestion {
+
+    public var numberOfVisits: Int {
+        return numberOfTotalVisits
+    }
+
+}
diff --git a/DuckDuckGo/AutocompleteViewControllerDelegate.swift b/DuckDuckGo/AutocompleteViewControllerDelegate.swift
index fbb0b6d9fb..e7f3671328 100644
--- a/DuckDuckGo/AutocompleteViewControllerDelegate.swift
+++ b/DuckDuckGo/AutocompleteViewControllerDelegate.swift
@@ -18,6 +18,7 @@
 //
 
 import UIKit
+import Suggestions
 
 protocol AutocompleteViewControllerDelegate: AnyObject {
 
diff --git a/DuckDuckGo/Base.lproj/Autocomplete.storyboard b/DuckDuckGo/Base.lproj/Autocomplete.storyboard
index 3254452129..2e7d24e4c4 100644
--- a/DuckDuckGo/Base.lproj/Autocomplete.storyboard
+++ b/DuckDuckGo/Base.lproj/Autocomplete.storyboard
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HV3-WA-HxT">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HV3-WA-HxT">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -20,7 +21,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="46" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="3mS-sG-8Ub">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <color key="separatorColor" red="0.26666666666666666" green="0.26666666666666666" blue="0.26666666666666666" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -34,13 +35,28 @@
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="252" verticalHuggingPriority="251" image="SuggestLoupe" translatesAutoresizingMaskIntoConstraints="NO" id="Dnd-CT-WA4">
                                                     <rect key="frame" x="16" y="11" width="24" height="24"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="24" id="XbS-9a-1vc"/>
+                                                        <constraint firstAttribute="height" constant="24" id="Y0E-R6-git"/>
+                                                    </constraints>
                                                 </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5ag-a1-mlA">
-                                                    <rect key="frame" x="48" y="13.5" width="273" height="19.5"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
+                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="L3L-RT-TDk">
+                                                    <rect key="frame" x="48" y="4" width="39.5" height="38"/>
+                                                    <subviews>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5ag-a1-mlA">
+                                                            <rect key="frame" x="0.0" y="0.0" width="39.5" height="19"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                            <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eiv-Cq-E2r">
+                                                            <rect key="frame" x="0.0" y="19" width="39.5" height="19"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                            <color key="textColor" name="textSecondary"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                </stackView>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N97-eI-Lps">
                                                     <rect key="frame" x="333" y="8" width="30" height="30"/>
                                                     <accessibility key="accessibilityConfiguration" label="Autocomplete suggestion"/>
@@ -56,10 +72,12 @@
                                             </subviews>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <constraints>
-                                                <constraint firstItem="5ag-a1-mlA" firstAttribute="leading" secondItem="Dnd-CT-WA4" secondAttribute="trailing" constant="8" id="3Jc-Oq-nOu"/>
-                                                <constraint firstItem="5ag-a1-mlA" firstAttribute="centerY" secondItem="QaM-hM-0gl" secondAttribute="centerY" id="6Nb-BF-Gki"/>
-                                                <constraint firstItem="N97-eI-Lps" firstAttribute="leading" secondItem="5ag-a1-mlA" secondAttribute="trailing" constant="12" id="QLj-tb-zce"/>
+                                                <constraint firstItem="L3L-RT-TDk" firstAttribute="centerY" secondItem="QaM-hM-0gl" secondAttribute="centerY" id="9WD-RX-vkf"/>
+                                                <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="L3L-RT-TDk" secondAttribute="bottom" constant="4" id="EVH-X7-3IQ"/>
+                                                <constraint firstItem="L3L-RT-TDk" firstAttribute="leading" secondItem="Dnd-CT-WA4" secondAttribute="trailing" constant="8" symbolic="YES" id="Rvu-jo-06K"/>
+                                                <constraint firstItem="N97-eI-Lps" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="L3L-RT-TDk" secondAttribute="trailing" constant="16" id="SnJ-8E-fil"/>
                                                 <constraint firstItem="Dnd-CT-WA4" firstAttribute="centerY" secondItem="QaM-hM-0gl" secondAttribute="centerY" id="V9w-6x-WUQ"/>
+                                                <constraint firstItem="L3L-RT-TDk" firstAttribute="top" relation="greaterThanOrEqual" secondItem="QaM-hM-0gl" secondAttribute="top" constant="4" id="bkO-GW-sNC"/>
                                                 <constraint firstItem="Dnd-CT-WA4" firstAttribute="leading" secondItem="QaM-hM-0gl" secondAttribute="leading" constant="16" id="emv-yc-ymv"/>
                                                 <constraint firstAttribute="trailing" secondItem="N97-eI-Lps" secondAttribute="trailing" constant="12" id="hm0-kg-rcx"/>
                                                 <constraint firstItem="N97-eI-Lps" firstAttribute="centerY" secondItem="QaM-hM-0gl" secondAttribute="centerY" id="zf3-hI-TKf"/>
@@ -74,6 +92,7 @@
                                             <outlet property="label" destination="5ag-a1-mlA" id="jTa-51-N4b"/>
                                             <outlet property="plusButton" destination="N97-eI-Lps" id="2NX-0l-oBk"/>
                                             <outlet property="typeImage" destination="Dnd-CT-WA4" id="p0g-6n-9j3"/>
+                                            <outlet property="urlLabel" destination="eiv-Cq-E2r" id="6nb-Qf-BpQ"/>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="NoSuggestionsTableViewCell" id="O6P-GP-haK" userLabel="Empty" customClass="NoSuggestionsTableViewCell" customModule="DuckDuckGo" customModuleProvider="target">
@@ -84,7 +103,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Suggestions" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gPe-Cv-14j">
-                                                    <rect key="frame" x="32" y="15" width="311" height="16"/>
+                                                    <rect key="frame" x="32" y="13.5" width="311" height="19.5"/>
                                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
                                                     <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -138,5 +157,8 @@
     <resources>
         <image name="Arrow-Top-Left-24" width="24" height="24"/>
         <image name="SuggestLoupe" width="24" height="24"/>
+        <namedColor name="textSecondary">
+            <color red="0.0" green="0.0" blue="0.0" alpha="0.60000002384185791" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
     </resources>
 </document>
diff --git a/DuckDuckGo/BlankSnapshotViewController.swift b/DuckDuckGo/BlankSnapshotViewController.swift
index b3e12628ec..7c80f9cd6e 100644
--- a/DuckDuckGo/BlankSnapshotViewController.swift
+++ b/DuckDuckGo/BlankSnapshotViewController.swift
@@ -19,6 +19,7 @@
 
 import UIKit
 import Core
+import Suggestions
 
 protocol BlankSnapshotViewRecoveringDelegate: AnyObject {
     
diff --git a/DuckDuckGo/CachedBookmarkSuggestions.swift b/DuckDuckGo/CachedBookmarkSuggestions.swift
new file mode 100644
index 0000000000..b8359d1e5a
--- /dev/null
+++ b/DuckDuckGo/CachedBookmarkSuggestions.swift
@@ -0,0 +1,61 @@
+//
+//  CachedBookmarkSuggestions.swift
+//  DuckDuckGo
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import CoreData
+import Bookmarks
+import Suggestions
+import Persistence
+import Core
+
+final class CachedBookmarks {
+
+    let context: NSManagedObjectContext
+    lazy var all: [BookmarkSuggestion] = {
+        let fetchRequest = CoreDataBookmarksSearchStore.shallowBookmarksFetchRequest(context: context)
+        let result = try? self.context.fetch(fetchRequest) as? [[String: Any]]
+
+        return result?.compactMap { BookmarkSuggestion($0) } ?? []
+    }()
+
+    init(_ bookmarksDatabase: CoreDataDatabase) {
+        context = bookmarksDatabase.makeContext(concurrencyType: .mainQueueConcurrencyType, name: "Autocomplete Bookmarks Cache")
+    }
+
+}
+
+struct BookmarkSuggestion: Suggestions.Bookmark {
+
+    var url: String
+    var title: String
+    var isFavorite: Bool
+
+    init?(_ properties: [String: Any]) {
+        guard let title = properties[#keyPath(BookmarkEntity.title)] as? String,
+              let url = properties[#keyPath(BookmarkEntity.url)] as? String,
+              let favoritesFolderCount = properties[#keyPath(BookmarkEntity.favoriteFolders)] as? Int else {
+                  return nil
+              }
+
+        self.title = title
+        self.url = url
+        self.isFavorite = favoritesFolderCount > 0
+    }
+
+}
diff --git a/DuckDuckGo/CriticalAlerts.swift b/DuckDuckGo/CriticalAlerts.swift
index 0d3f25796f..510514d028 100644
--- a/DuckDuckGo/CriticalAlerts.swift
+++ b/DuckDuckGo/CriticalAlerts.swift
@@ -87,4 +87,16 @@ struct CriticalAlerts {
         return alertController
     }
 
+    static func makeVPNEarlyAccessOverAlert() -> UIAlertController {
+        let alertController = UIAlertController(title: UserText.vpnEarlyAccessOverAlertTitle,
+                                                message: UserText.vpnEarlyAccessOverAlertMessage,
+                                                preferredStyle: .alert)
+        alertController.overrideUserInterfaceStyle()
+
+        let closeButton = UIAlertAction(title: UserText.vpnEarlyAccessOverAlertAction, style: .cancel)
+
+        alertController.addAction(closeButton)
+        return alertController
+    }
+
 }
diff --git a/DuckDuckGo/DefaultNetworkProtectionVisibility.swift b/DuckDuckGo/DefaultNetworkProtectionVisibility.swift
new file mode 100644
index 0000000000..406a8100ce
--- /dev/null
+++ b/DuckDuckGo/DefaultNetworkProtectionVisibility.swift
@@ -0,0 +1,96 @@
+//
+//  DefaultNetworkProtectionVisibility.swift
+//  DuckDuckGo
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if NETWORK_PROTECTION
+
+import Foundation
+import BrowserServicesKit
+import Waitlist
+import NetworkProtection
+import Core
+
+struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
+    private let privacyConfigurationManager: PrivacyConfigurationManaging
+    private let networkProtectionTokenStore: NetworkProtectionTokenStore?
+    private let networkProtectionAccessManager: NetworkProtectionAccess?
+    private let featureFlagger: FeatureFlagger
+    private let userDefaults: UserDefaults
+
+    init(privacyConfigurationManager: PrivacyConfigurationManaging = ContentBlocking.shared.privacyConfigurationManager,
+         networkProtectionTokenStore: NetworkProtectionTokenStore? = NetworkProtectionKeychainTokenStore(),
+         networkProtectionAccessManager: NetworkProtectionAccess? = NetworkProtectionAccessController(),
+         featureFlagger: FeatureFlagger = AppDependencyProvider.shared.featureFlagger,
+         userDefaults: UserDefaults = .networkProtectionGroupDefaults) {
+        self.privacyConfigurationManager = privacyConfigurationManager
+        self.networkProtectionTokenStore = networkProtectionTokenStore
+        self.networkProtectionAccessManager = networkProtectionAccessManager
+        self.featureFlagger = featureFlagger
+        self.userDefaults = userDefaults
+    }
+
+    /// A lite version with fewer dependencies
+    /// We need this to run shouldMonitorEntitlement() check inside the token store
+    static func forTokenStore() -> DefaultNetworkProtectionVisibility {
+        DefaultNetworkProtectionVisibility(networkProtectionTokenStore: nil, networkProtectionAccessManager: nil)
+    }
+
+    func isWaitlistBetaActive() -> Bool {
+        privacyConfigurationManager.privacyConfig.isSubfeatureEnabled(NetworkProtectionSubfeature.waitlistBetaActive)
+    }
+    
+    func isWaitlistUser() -> Bool {
+        guard let networkProtectionTokenStore, let networkProtectionAccessManager else {
+            preconditionFailure("networkProtectionTokenStore and networkProtectionAccessManager must be non-nil")
+        }
+
+        let hasLegacyAuthToken = {
+            guard let authToken = try? networkProtectionTokenStore.fetchToken(),
+                  !authToken.hasPrefix(NetworkProtectionKeychainTokenStore.authTokenPrefix) else {
+                return false
+            }
+            return true
+        }()
+        let hasBeenInvited = {
+            let vpnAccessType = networkProtectionAccessManager.networkProtectionAccessType()
+            return vpnAccessType == .waitlistInvited || vpnAccessType == .inviteCodeInvited
+        }()
+
+        return hasLegacyAuthToken || hasBeenInvited
+    }
+
+    // todo - https://app.asana.com/0/0/1206844038943626/f
+    func isPrivacyProLaunched() -> Bool {
+        if let subscriptionOverrideEnabled = userDefaults.subscriptionOverrideEnabled {
+#if ALPHA || DEBUG
+            return subscriptionOverrideEnabled
+#else
+            return false
+#endif
+        }
+
+        return AppDependencyProvider.shared.subscriptionFeatureAvailability.isFeatureAvailable
+    }
+    
+    // todo - https://app.asana.com/0/0/1206844038943626/f
+    func shouldMonitorEntitlement() -> Bool {
+        isPrivacyProLaunched()
+    }
+}
+
+#endif
diff --git a/DuckDuckGo/Feedback/VPNMetadataCollector.swift b/DuckDuckGo/Feedback/VPNMetadataCollector.swift
index 71a65ada7d..7834e52149 100644
--- a/DuckDuckGo/Feedback/VPNMetadataCollector.swift
+++ b/DuckDuckGo/Feedback/VPNMetadataCollector.swift
@@ -69,7 +69,7 @@ struct VPNMetadata: Encodable {
 
     func toPrettyPrintedJSON() -> String? {
         let encoder = JSONEncoder()
-        encoder.outputFormatting = .prettyPrinted
+        encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
 
         guard let encodedMetadata = try? encoder.encode(self) else {
             assertionFailure("Failed to encode metadata")
@@ -81,6 +81,7 @@ struct VPNMetadata: Encodable {
 
     func toBase64() -> String {
         let encoder = JSONEncoder()
+        encoder.outputFormatting = [.sortedKeys]
 
         do {
             let encodedMetadata = try encoder.encode(self)
diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
index 30a2b813ab..4c847f4a40 100644
--- a/DuckDuckGo/MainViewController.swift
+++ b/DuckDuckGo/MainViewController.swift
@@ -30,6 +30,7 @@ import Bookmarks
 import Persistence
 import PrivacyDashboard
 import Networking
+import Suggestions
 
 #if SUBSCRIPTION
 import Subscription
@@ -371,7 +372,8 @@ class MainViewController: UIViewController {
         guard let controller = storyboard.instantiateInitialViewController(creator: { coder in
             SuggestionTrayViewController(coder: coder,
                                          favoritesViewModel: self.favoritesViewModel,
-                                         bookmarksSearch: self.bookmarksCachingSearch)
+                                         bookmarksDatabase: self.bookmarksDatabase,
+                                         historyCoordinator: self.historyManager.historyCoordinator)
         }) else {
             assertionFailure()
             return
@@ -565,12 +567,12 @@ class MainViewController: UIViewController {
 
         if let suggestionsTray = suggestionTrayController {
             let suggestionsFrameInView = suggestionsTray.view.convert(suggestionsTray.contentFrame, to: view)
-            
+
             let overflow = suggestionsFrameInView.size.height + suggestionsFrameInView.origin.y - keyboardFrameInView.origin.y + 10
             if overflow > 0 {
-                suggestionTrayController?.applyContentInset(UIEdgeInsets(top: 0, left: 0, bottom: overflow, right: 0))
+                suggestionsTray.applyContentInset(UIEdgeInsets(top: 0, left: 0, bottom: overflow, right: 0))
             } else {
-                suggestionTrayController?.applyContentInset(.zero)
+                suggestionsTray.applyContentInset(.zero)
             }
         }
 
@@ -1393,7 +1395,7 @@ class MainViewController: UIViewController {
     @objc
     private func onNetworkProtectionAccountSignIn(_ notification: Notification) {
         tunnelDefaults.resetEntitlementMessaging()
-        print("[NetP Subscription] Reset expired entitlement messaging")
+        os_log("[NetP Subscription] Reset expired entitlement messaging", log: .networkProtection, type: .info)
     }
 #endif
 
@@ -1773,42 +1775,72 @@ extension MainViewController: AutocompleteViewControllerDelegate {
     func autocomplete(selectedSuggestion suggestion: Suggestion) {
         homeController?.chromeDelegate = nil
         dismissOmniBar()
-        if let url = suggestion.url {
+        switch suggestion {
+        case .phrase(phrase: let phrase):
+            if let url = URL.makeSearchURL(text: phrase) {
+                loadUrl(url)
+            } else {
+                os_log("Couldn‘t form URL for suggestion “%s”", log: .lifecycleLog, type: .error, phrase)
+            }
+        case .website(url: let url):
             if url.isBookmarklet() {
                 executeBookmarklet(url)
             } else {
                 loadUrl(url)
             }
-        } else if let url = URL.makeSearchURL(text: suggestion.suggestion) {
+        case .bookmark(_, url: let url, _, _):
             loadUrl(url)
-        } else {
-            os_log("Couldn‘t form URL for suggestion “%s”", log: .lifecycleLog, type: .error, suggestion.suggestion)
-            return
+        case .historyEntry(_, url: let url, _):
+            loadUrl(url)
+        case .unknown(value: let value):
+            assertionFailure("Unknown suggestion: \(value)")
         }
+
         showHomeRowReminder()
     }
 
     func autocomplete(pressedPlusButtonForSuggestion suggestion: Suggestion) {
-        if let url = suggestion.url {
-            if url.isDuckDuckGoSearch {
-                viewCoordinator.omniBar.textField.text = suggestion.suggestion
+        switch suggestion {
+        case .phrase(phrase: let phrase):
+        viewCoordinator.omniBar.textField.text = phrase
+        case .website(url: let url):
+            if url.isDuckDuckGoSearch, let query = url.searchQuery {
+                viewCoordinator.omniBar.textField.text = query
             } else if !url.isBookmarklet() {
                 viewCoordinator.omniBar.textField.text = url.absoluteString
             }
-        } else {
-            viewCoordinator.omniBar.textField.text = suggestion.suggestion
+        case .bookmark(title: let title, _, _, _):
+            viewCoordinator.omniBar.textField.text = title
+        case .historyEntry(title: let title, _, _):
+            viewCoordinator.omniBar.textField.text = title
+        case .unknown(value: let value):
+            assertionFailure("Unknown suggestion: \(value)")
         }
+
         viewCoordinator.omniBar.textDidChange()
     }
     
     func autocomplete(highlighted suggestion: Suggestion, for query: String) {
-        if let url = suggestion.url {
+
+        switch suggestion {
+        case .phrase(phrase: let phrase):
+            viewCoordinator.omniBar.textField.text = phrase
+            if phrase.hasPrefix(query) {
+                viewCoordinator.omniBar.selectTextToEnd(query.count)
+            }
+        case .website(url: let url):
             viewCoordinator.omniBar.textField.text = url.absoluteString
-        } else {
-            viewCoordinator.omniBar.textField.text = suggestion.suggestion
-            if suggestion.suggestion.hasPrefix(query) {
+        case .bookmark(title: let title, _, _, _):
+            viewCoordinator.omniBar.textField.text = title
+            if title.hasPrefix(query) {
+                viewCoordinator.omniBar.selectTextToEnd(query.count)
+            }
+        case .historyEntry(title: let title, let url, _):
+            if (title ?? url.absoluteString).hasPrefix(query) {
                 viewCoordinator.omniBar.selectTextToEnd(query.count)
             }
+        case .unknown(value: let value):
+            assertionFailure("Unknown suggestion: \(value)")
         }
     }
 
diff --git a/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift b/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift
index fee41a348a..a062a26b3c 100644
--- a/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift
+++ b/DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift
@@ -60,12 +60,16 @@ extension ConnectionServerInfoObserverThroughSession {
 
 extension NetworkProtectionKeychainTokenStore {
     convenience init() {
-        let isSubscriptionEnabled = AppDependencyProvider.shared.featureFlagger.isFeatureOn(.subscription)
-#if SUBSCRIPTION && ALPHA
-        let accessTokenProvider: () -> String? = { AccountManager().accessToken }
-#else
-        let accessTokenProvider: () -> String? = { nil }
+        let featureVisibility = DefaultNetworkProtectionVisibility.forTokenStore()
+        let isSubscriptionEnabled = featureVisibility.isPrivacyProLaunched()
+        let accessTokenProvider: () -> String? = {
+#if SUBSCRIPTION
+            if featureVisibility.shouldMonitorEntitlement() {
+                return { AccountManager().accessToken }
+            }
 #endif
+            return { nil }
+        }()
 
         self.init(keychainType: .dataProtection(.unspecified),
                   serviceName: "\(Bundle.main.bundleIdentifier!).authToken",
@@ -83,7 +87,7 @@ extension NetworkProtectionCodeRedemptionCoordinator {
             tokenStore: NetworkProtectionKeychainTokenStore(),
             isManualCodeRedemptionFlow: isManualCodeRedemptionFlow,
             errorEvents: .networkProtectionAppDebugEvents,
-            isSubscriptionEnabled: AppDependencyProvider.shared.featureFlagger.isFeatureOn(.subscription)
+            isSubscriptionEnabled: DefaultNetworkProtectionVisibility().isPrivacyProLaunched()
         )
     }
 }
@@ -104,7 +108,7 @@ extension NetworkProtectionLocationListCompositeRepository {
             environment: settings.selectedEnvironment,
             tokenStore: NetworkProtectionKeychainTokenStore(),
             errorEvents: .networkProtectionAppDebugEvents,
-            isSubscriptionEnabled: AppDependencyProvider.shared.featureFlagger.isFeatureOn(.subscription)
+            isSubscriptionEnabled: DefaultNetworkProtectionVisibility().isPrivacyProLaunched()
         )
     }
 }
diff --git a/DuckDuckGo/NetworkProtectionDebugViewController.swift b/DuckDuckGo/NetworkProtectionDebugViewController.swift
index f3f98803ec..d48adbac5e 100644
--- a/DuckDuckGo/NetworkProtectionDebugViewController.swift
+++ b/DuckDuckGo/NetworkProtectionDebugViewController.swift
@@ -34,22 +34,27 @@ import Network
 import NetworkExtension
 import NetworkProtection
 
+#if SUBSCRIPTION
+import Subscription
+#endif
+
 // swiftlint:disable:next type_body_length
 final class NetworkProtectionDebugViewController: UITableViewController {
     private let titles = [
+        Sections.featureVisibility: "Feature Visibility",
         Sections.clearData: "Clear Data",
         Sections.debugFeature: "Debug Features",
         Sections.debugCommand: "Debug Commands",
         Sections.simulateFailure: "Simulate Failure",
         Sections.registrationKey: "Registration Key",
         Sections.networkPath: "Network Path",
-        Sections.lastDisconnectError: "Last Disconnect Error",
         Sections.connectionTest: "Connection Test",
-        Sections.vpnConfiguration: "VPN Configuration"
-
+        Sections.vpnConfiguration: "VPN Configuration",
+        Sections.vpnMetadata: "VPN Metadata",
     ]
 
     enum Sections: Int, CaseIterable {
+        case featureVisibility
         case clearData
         case debugFeature
         case debugCommand
@@ -57,15 +62,19 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         case registrationKey
         case connectionTest
         case networkPath
-        case lastDisconnectError
         case vpnConfiguration
+        case vpnMetadata
     }
 
-    enum ClearDataRows: Int, CaseIterable {
+    enum FeatureVisibilityRows: Int, CaseIterable {
+        case toggleSelectedEnvironment
+        case updateSubscriptionOverride
+        case debugInfo
+    }
 
+    enum ClearDataRows: Int, CaseIterable {
         case clearAuthToken
         case clearAllVPNData
-
     }
 
     enum DebugFeatureRows: Int, CaseIterable {
@@ -89,16 +98,13 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         case shutDown
         case showEntitlementMessaging
         case resetEntitlementMessaging
+        case resetThankYouMessaging
     }
 
     enum NetworkPathRows: Int, CaseIterable {
         case networkPath
     }
 
-    enum LastDisconnectErrorRows: Int, CaseIterable {
-        case lastDisconnectError
-    }
-
     enum ConnectionTestRows: Int, CaseIterable {
         case runConnectionTest
     }
@@ -108,6 +114,11 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         case fullProtocolConfigurationData
     }
 
+    enum MetadataRows: Int, CaseIterable {
+        case refreshMetadata
+        case metadataContents
+    }
+
     // MARK: Properties
 
     private let debugFeatures: NetworkProtectionDebugFeatures
@@ -115,9 +126,9 @@ final class NetworkProtectionDebugViewController: UITableViewController {
     private let pathMonitor = NWPathMonitor()
 
     private var currentNetworkPath: String?
-    private var lastDisconnectError: String?
     private var baseConfigurationData: String?
     private var fullProtocolConfigurationData: String?
+    private var vpnMetadata: VPNMetadata?
 
     private struct ConnectionTestResult {
         let interface: String
@@ -148,9 +159,12 @@ final class NetworkProtectionDebugViewController: UITableViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        loadLastDisconnectError()
         loadConfigurationData()
         startPathMonitor()
+
+        Task {
+            await self.refreshMetadata()
+        }
     }
 
     // MARK: Table View
@@ -199,22 +213,26 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         case .networkPath:
             configure(cell, forNetworkPathRow: indexPath.row)
 
-        case .lastDisconnectError:
-            configure(cell, forLastDisconnectErrorRow: indexPath.row)
-
         case .connectionTest:
             configure(cell, forConnectionTestRow: indexPath.row)
 
         case .vpnConfiguration:
             configure(cell, forConfigurationRow: indexPath.row)
 
-        case.none:
+        case .vpnMetadata:
+            configure(cell, forMetadataRow: indexPath.row)
+
+        case .featureVisibility:
+            configure(cell, forVisibilityRow: indexPath.row)
+
+        case .none:
             break
         }
 
         return cell
     }
 
+    // swiftlint:disable:next cyclomatic_complexity
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         switch Sections(rawValue: section) {
         case .clearData: return ClearDataRows.allCases.count
@@ -223,9 +241,10 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         case .simulateFailure: return SimulateFailureRows.allCases.count
         case .registrationKey: return RegistrationKeyRows.allCases.count
         case .networkPath: return NetworkPathRows.allCases.count
-        case .lastDisconnectError: return LastDisconnectErrorRows.allCases.count
         case .connectionTest: return ConnectionTestRows.allCases.count + connectionTestResults.count
         case .vpnConfiguration: return ConfigurationRows.allCases.count
+        case .vpnMetadata: return MetadataRows.allCases.count
+        case .featureVisibility: return FeatureVisibilityRows.allCases.count
         case .none: return 0
 
         }
@@ -250,8 +269,6 @@ final class NetworkProtectionDebugViewController: UITableViewController {
             didSelectRegistrationKeyAction(at: indexPath)
         case .networkPath:
             break
-        case .lastDisconnectError:
-            break
         case .connectionTest:
             if indexPath.row == connectionTestResults.count {
                 Task {
@@ -260,6 +277,10 @@ final class NetworkProtectionDebugViewController: UITableViewController {
             }
         case .vpnConfiguration:
             break
+        case .vpnMetadata:
+            didSelectVPNMetadataAction(at: indexPath)
+        case .featureVisibility:
+            didSelectFeatureVisibility(at: indexPath)
         case .none:
             break
         }
@@ -370,6 +391,8 @@ final class NetworkProtectionDebugViewController: UITableViewController {
             cell.textLabel?.text = "Show Entitlement Messaging"
         case .resetEntitlementMessaging:
             cell.textLabel?.text = "Reset Entitlement Messaging"
+        case .resetThankYouMessaging:
+            cell.textLabel?.text = "Reset Thank You Messaging"
         case .none:
             break
         }
@@ -389,6 +412,8 @@ final class NetworkProtectionDebugViewController: UITableViewController {
             UserDefaults.networkProtectionGroupDefaults.enableEntitlementMessaging()
         case .resetEntitlementMessaging:
             UserDefaults.networkProtectionGroupDefaults.resetEntitlementMessaging()
+        case .resetThankYouMessaging:
+            UserDefaults.networkProtectionGroupDefaults.resetThankYouMessaging()
         case .none:
             break
         }
@@ -425,20 +450,6 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         pathMonitor.start(queue: .main)
     }
 
-    // MARK: Last disconnect error
-
-    private func configure(_ cell: UITableViewCell, forLastDisconnectErrorRow row: Int) {
-        cell.textLabel?.font = .monospacedSystemFont(ofSize: 13.0, weight: .regular)
-        cell.textLabel?.text = lastDisconnectError ?? "Loading Last Disconnect Error..."
-    }
-
-    private func loadLastDisconnectError() {
-        Task { @MainActor in
-            lastDisconnectError = await DefaultVPNMetadataCollector().lastDisconnectError()
-            tableView.reloadData()
-        }
-    }
-
     // MARK: Connection Test
 
     private func configure(_ cell: UITableViewCell, forConnectionTestRow row: Int) {
@@ -548,7 +559,6 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         case .none:
             assertionFailure("Couldn't map configuration row")
         }
-
     }
 
     private func loadConfigurationData() {
@@ -586,6 +596,112 @@ final class NetworkProtectionDebugViewController: UITableViewController {
         }
     }
 
+    // MARK: - VPN Metadata
+
+    private func configure(_ cell: UITableViewCell, forMetadataRow row: Int) {
+        cell.textLabel?.font = .systemFont(ofSize: 17)
+
+        switch MetadataRows(rawValue: row) {
+        case .refreshMetadata:
+            cell.textLabel?.text = "Refresh Metadata"
+        case .metadataContents:
+            cell.textLabel?.font = .monospacedSystemFont(ofSize: 13.0, weight: .regular)
+            cell.textLabel?.text = vpnMetadata?.toPrettyPrintedJSON() ?? "No Metadata"
+        case .none:
+            assertionFailure("Couldn't map configuration row")
+        }
+    }
+
+    private func didSelectVPNMetadataAction(at indexPath: IndexPath) {
+        switch MetadataRows(rawValue: indexPath.row) {
+        case .refreshMetadata:
+            Task {
+                await refreshMetadata()
+            }
+        case .metadataContents:
+            break
+        case .none:
+            break
+        }
+    }
+
+    // MARK: Feature Visibility
+
+    private func configure(_ cell: UITableViewCell, forVisibilityRow row: Int) {
+        switch FeatureVisibilityRows(rawValue: row) {
+        case .toggleSelectedEnvironment:
+            let settings = VPNSettings(defaults: .networkProtectionGroupDefaults)
+            if settings.selectedEnvironment == .production {
+                cell.textLabel?.text = "Selected Environment: PRODUCTION"
+            } else {
+                cell.textLabel?.text = "Selected Environment: STAGING"
+            }
+        case .updateSubscriptionOverride:
+            let defaults = UserDefaults.networkProtectionGroupDefaults
+            if let subscriptionOverrideEnabled = defaults.subscriptionOverrideEnabled {
+                cell.textLabel?.text = subscriptionOverrideEnabled ? "Subscription Override: ENABLED" : "Subscription Override: DISABLED"
+            } else {
+                cell.textLabel?.text = "Subscription Override: N/A"
+            }
+        case .debugInfo:
+            let vpnVisibility = DefaultNetworkProtectionVisibility()
+
+            cell.textLabel?.font = .monospacedSystemFont(ofSize: 13.0, weight: .regular)
+            cell.textLabel?.text = """
+Endpoint: \(VPNSettings(defaults: .networkProtectionGroupDefaults).selectedEnvironment.endpointURL.absoluteString)
+
+isPrivacyProLaunched: \(vpnVisibility.isPrivacyProLaunched() ? "YES" : "NO")
+isWaitlistBetaActive: \(vpnVisibility.isWaitlistBetaActive() ? "YES" : "NO")
+isWaitlistUser: \(vpnVisibility.isWaitlistUser() ? "YES" : "NO")
+
+shouldShowThankYouMessaging: \(vpnVisibility.shouldShowThankYouMessaging() ? "YES" : "NO")
+shouldKeepVPNAccessViaWaitlist: \(vpnVisibility.shouldKeepVPNAccessViaWaitlist() ? "YES" : "NO")
+shouldMonitorEntitlement: \(vpnVisibility.shouldMonitorEntitlement() ? "YES" : "NO")
+shouldShowVPNShortcut: \(vpnVisibility.shouldShowVPNShortcut() ? "YES" : "NO")
+"""
+        case .none:
+            break
+        }
+    }
+
+    @MainActor
+    private func refreshMetadata() async {
+        let collector = DefaultVPNMetadataCollector()
+        self.vpnMetadata = await collector.collectMetadata()
+        self.tableView.reloadData()
+    }
+
+    private func didSelectFeatureVisibility(at indexPath: IndexPath) {
+        switch FeatureVisibilityRows(rawValue: indexPath.row) {
+        case .toggleSelectedEnvironment:
+            let vpnSettings = VPNSettings(defaults: .networkProtectionGroupDefaults)
+            if vpnSettings.selectedEnvironment == .production {
+                vpnSettings.selectedEnvironment = .staging
+            } else {
+                vpnSettings.selectedEnvironment = .production
+            }
+            vpnSettings.selectedServer = .automatic
+            tableView.reloadData()
+        case .updateSubscriptionOverride:
+            let defaults = UserDefaults.networkProtectionGroupDefaults
+            if let subscriptionOverrideEnabled = defaults.subscriptionOverrideEnabled {
+                if subscriptionOverrideEnabled {
+                    defaults.subscriptionOverrideEnabled = false
+#if SUBSCRIPTION
+                    AccountManager().signOut()
+#endif
+                } else {
+                    defaults.resetsubscriptionOverrideEnabled()
+                }
+            } else {
+                defaults.subscriptionOverrideEnabled = true
+            }
+            tableView.reloadData()
+        case .debugInfo, .none:
+            break
+        }
+    }
+
     // MARK: Selection Actions
 
     private func clearAuthToken() {
diff --git a/DuckDuckGo/NetworkProtectionFeatureVisibility.swift b/DuckDuckGo/NetworkProtectionFeatureVisibility.swift
new file mode 100644
index 0000000000..a698deb730
--- /dev/null
+++ b/DuckDuckGo/NetworkProtectionFeatureVisibility.swift
@@ -0,0 +1,56 @@
+//
+//  NetworkProtectionFeatureVisibility.swift
+//  DuckDuckGo
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+
+public protocol NetworkProtectionFeatureVisibility {
+    func isWaitlistBetaActive() -> Bool
+    func isWaitlistUser() -> Bool
+    func isPrivacyProLaunched() -> Bool
+
+    /// Whether to show the thank-you messaging for current waitlist users
+    func shouldShowThankYouMessaging() -> Bool
+
+    /// Whether to let the user continues to use the VPN via the waitlist
+    /// This should only before 100% roll out
+    func shouldKeepVPNAccessViaWaitlist() -> Bool
+
+    /// Whether to enforce entitlement check and show entitlement-related messaging
+    /// This should always happen after 100% roll out
+    /// N.B. Backend will independently check for valid entitlement regardless of this value
+    func shouldMonitorEntitlement() -> Bool
+
+    /// Whether to show VPN shortcut on the homescreen
+    func shouldShowVPNShortcut() -> Bool
+}
+
+public extension NetworkProtectionFeatureVisibility {
+    func shouldShowThankYouMessaging() -> Bool {
+        isPrivacyProLaunched() && isWaitlistUser()
+    }
+
+    func shouldKeepVPNAccessViaWaitlist() -> Bool {
+        !isPrivacyProLaunched() && isWaitlistBetaActive() && isWaitlistUser()
+    }
+
+    // todo - https://app.asana.com/0/0/1206827703748771/f
+    func shouldShowVPNShortcut() -> Bool {
+        isPrivacyProLaunched() || shouldKeepVPNAccessViaWaitlist()
+    }
+}
diff --git a/DuckDuckGo/NetworkProtectionRootView.swift b/DuckDuckGo/NetworkProtectionRootView.swift
index 0be2ed7b31..4fd5c58998 100644
--- a/DuckDuckGo/NetworkProtectionRootView.swift
+++ b/DuckDuckGo/NetworkProtectionRootView.swift
@@ -32,13 +32,19 @@ struct NetworkProtectionRootView: View {
             redemptionCoordinator: NetworkProtectionCodeRedemptionCoordinator(isManualCodeRedemptionFlow: true),
             completion: inviteCompletion
         )
-        switch model.initialViewKind {
-        case .invite:
-            NetworkProtectionInviteView(model: inviteViewModel)
-        case .status:
+        if DefaultNetworkProtectionVisibility().isPrivacyProLaunched() {
             NetworkProtectionStatusView(
                 statusModel: NetworkProtectionStatusViewModel()
             )
+        } else {
+            switch model.initialViewKind {
+            case .invite:
+                NetworkProtectionInviteView(model: inviteViewModel)
+            case .status:
+                NetworkProtectionStatusView(
+                    statusModel: NetworkProtectionStatusViewModel()
+                )
+            }
         }
     }
 }
diff --git a/DuckDuckGo/NetworkProtectionTunnelController.swift b/DuckDuckGo/NetworkProtectionTunnelController.swift
index 24e993cb86..e8aea07fce 100644
--- a/DuckDuckGo/NetworkProtectionTunnelController.swift
+++ b/DuckDuckGo/NetworkProtectionTunnelController.swift
@@ -141,6 +141,8 @@ final class NetworkProtectionTunnelController: TunnelController {
 
         options["activationAttemptId"] = UUID().uuidString as NSString
         options["authToken"] = try tokenStore.fetchToken() as NSString?
+        options[NetworkProtectionOptionKey.selectedEnvironment] = VPNSettings(defaults: .networkProtectionGroupDefaults)
+            .selectedEnvironment.rawValue as NSString
 
         do {
             try tunnelManager.connection.startVPNTunnel(options: options)
diff --git a/DuckDuckGo/NetworkProtectionVisibilityForTunnelProvider.swift b/DuckDuckGo/NetworkProtectionVisibilityForTunnelProvider.swift
new file mode 100644
index 0000000000..964641bf59
--- /dev/null
+++ b/DuckDuckGo/NetworkProtectionVisibilityForTunnelProvider.swift
@@ -0,0 +1,52 @@
+//
+//  NetworkProtectionVisibilityForTunnelProvider.swift
+//  DuckDuckGo
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if NETWORK_PROTECTION
+
+import Foundation
+
+#if SUBSCRIPTION
+import Subscription
+#endif
+
+struct NetworkProtectionVisibilityForTunnelProvider: NetworkProtectionFeatureVisibility {
+    func isWaitlistBetaActive() -> Bool {
+        preconditionFailure("Does not apply to Tunnel Provider")
+    }
+
+    func isWaitlistUser() -> Bool {
+        preconditionFailure("Does not apply to Tunnel Provider")
+    }
+    
+    // todo - https://app.asana.com/0/0/1206844038943626/f
+    func isPrivacyProLaunched() -> Bool {
+#if SUBSCRIPTION
+        AccountManager().accessToken != nil
+#else
+        false
+#endif
+    }
+    
+    // todo - https://app.asana.com/0/0/1206844038943626/f
+    func shouldMonitorEntitlement() -> Bool {
+        isPrivacyProLaunched()
+    }
+}
+
+#endif
diff --git a/DuckDuckGo/OmniBarDelegate.swift b/DuckDuckGo/OmniBarDelegate.swift
index de8a977cef..698b0c73c2 100644
--- a/DuckDuckGo/OmniBarDelegate.swift
+++ b/DuckDuckGo/OmniBarDelegate.swift
@@ -18,6 +18,7 @@
 //
 
 import Foundation
+import Suggestions
 
 protocol OmniBarDelegate: AnyObject {
 
diff --git a/DuckDuckGo/SettingsCustomizeView.swift b/DuckDuckGo/SettingsCustomizeView.swift
index 6570427420..8560f047c3 100644
--- a/DuckDuckGo/SettingsCustomizeView.swift
+++ b/DuckDuckGo/SettingsCustomizeView.swift
@@ -35,6 +35,7 @@ struct SettingsCustomizeView: View {
                              isButton: true)
             
             SettingsCellView(label: UserText.settingsAutocomplete,
+                             subtitle: viewModel.autocompleteSubtitle,
                              accesory: .toggle(isOn: viewModel.autocompleteBinding))
             
             if viewModel.state.speechRecognitionAvailable {
diff --git a/DuckDuckGo/SettingsLegacyViewProvider.swift b/DuckDuckGo/SettingsLegacyViewProvider.swift
index 2bdd9740bd..7749d9bcb2 100644
--- a/DuckDuckGo/SettingsLegacyViewProvider.swift
+++ b/DuckDuckGo/SettingsLegacyViewProvider.swift
@@ -81,7 +81,7 @@ class SettingsLegacyViewProvider: ObservableObject {
     var feedback: UIViewController { instantiate("Feedback", fromStoryboard: "Feedback") }
     var about: UIViewController { AboutViewController() }
     
-    @available(iOS 15.0, *)
+    @available(iOS 15, *)
     var netPWaitlist: UIViewController { VPNWaitlistViewController(nibName: nil, bundle: nil) }
     
     @available(iOS 15, *)
diff --git a/DuckDuckGo/SettingsViewModel.swift b/DuckDuckGo/SettingsViewModel.swift
index 75ffb5d304..d72fff2f76 100644
--- a/DuckDuckGo/SettingsViewModel.swift
+++ b/DuckDuckGo/SettingsViewModel.swift
@@ -52,6 +52,9 @@ final class SettingsViewModel: ObservableObject {
 #if SUBSCRIPTION
     private var accountManager: AccountManager
     private var signOutObserver: Any?
+    private var isPrivacyProEnabled: Bool {
+        AppDependencyProvider.shared.subscriptionFeatureAvailability.isFeatureAvailable
+    }
         
     // Sheet Presentation & Navigation
     @Published var isRestoringSubscription: Bool = false
@@ -96,6 +99,7 @@ final class SettingsViewModel: ObservableObject {
     }
     
     var shouldShowNoMicrophonePermissionAlert: Bool = false
+    var autocompleteSubtitle: String?
 
 #if SUBSCRIPTION
     // MARK: - Deep linking
@@ -104,7 +108,7 @@ final class SettingsViewModel: ObservableObject {
     // immediately after loading the Settings View
     @Published private(set) var deepLinkTarget: SettingsDeepLinkSection?
 #endif
-    
+
     // MARK: Bindings
     
     var themeBinding: Binding<ThemeName> {
@@ -161,6 +165,8 @@ final class SettingsViewModel: ObservableObject {
             set: {
                 self.appSettings.autocomplete = $0
                 self.state.autocomplete = $0
+
+                Pixel.fire(pixel: self.state.autocomplete ? .autocompleteEnabled : .autocompleteDisabled)
             }
         )
     }
@@ -211,6 +217,7 @@ final class SettingsViewModel: ObservableObject {
          legacyViewProvider: SettingsLegacyViewProvider,
          accountManager: AccountManager,
          voiceSearchHelper: VoiceSearchHelperProtocol = AppDependencyProvider.shared.voiceSearchHelper,
+         variantManager: VariantManager = AppDependencyProvider.shared.variantManager,
          deepLink: SettingsDeepLinkSection? = nil) {
         self.state = SettingsState.defaults
         self.legacyViewProvider = legacyViewProvider
@@ -219,7 +226,7 @@ final class SettingsViewModel: ObservableObject {
         self.deepLinkTarget = deepLink
         
         setupNotificationObservers()
-        
+        autocompleteSubtitle = variantManager.isSupported(feature: .history) ? UserText.settingsAutocompleteSubtitle : nil
     }
     
     deinit {
@@ -230,10 +237,12 @@ final class SettingsViewModel: ObservableObject {
     // MARK: Default Init
     init(state: SettingsState? = nil,
          legacyViewProvider: SettingsLegacyViewProvider,
+         variantManager: VariantManager = AppDependencyProvider.shared.variantManager,
          voiceSearchHelper: VoiceSearchHelperProtocol = AppDependencyProvider.shared.voiceSearchHelper) {
         self.state = SettingsState.defaults
         self.legacyViewProvider = legacyViewProvider
         self.voiceSearchHelper = voiceSearchHelper
+        autocompleteSubtitle = variantManager.isSupported(feature: .history) ? UserText.settingsAutocompleteSubtitle : nil
     }
 #endif
     
@@ -278,8 +287,7 @@ extension SettingsViewModel {
         var enabled = false
         #if NETWORK_PROTECTION
             if #available(iOS 15, *) {
-                let accessController = NetworkProtectionAccessController()
-                enabled = accessController.networkProtectionAccessType() != .none
+                enabled = DefaultNetworkProtectionVisibility().shouldKeepVPNAccessViaWaitlist()
             }
         #endif
         return SettingsState.NetworkProtection(enabled: enabled, status: "")
@@ -292,7 +300,7 @@ extension SettingsViewModel {
         
     #if SUBSCRIPTION
         if #available(iOS 15, *) {
-            enabled = featureFlagger.isFeatureOn(.subscription)
+            enabled = isPrivacyProEnabled
             canPurchase = SubscriptionPurchaseEnvironment.canPurchase
             await setupSubscriptionEnvironment()
             if let token = AccountManager().accessToken {
@@ -322,7 +330,8 @@ extension SettingsViewModel {
                                      return SyncUI.UserText.syncTitle
                                  }())
     }
-        
+     
+    
     private func firePixel(_ event: Pixel.Event) {
         Pixel.fire(pixel: event)
     }
@@ -426,16 +435,25 @@ extension SettingsViewModel {
     
     #if NETWORK_PROTECTION
     private func updateNetPStatus(connectionStatus: ConnectionStatus) {
-        switch NetworkProtectionAccessController().networkProtectionAccessType() {
-        case .none, .waitlistAvailable, .waitlistJoined, .waitlistInvitedPendingTermsAcceptance:
-            self.state.networkProtection.status = VPNWaitlist.shared.settingsSubtitle
-        case .waitlistInvited, .inviteCodeInvited:
+        if DefaultNetworkProtectionVisibility().isPrivacyProLaunched() {
             switch connectionStatus {
             case .connected:
                 self.state.networkProtection.status = UserText.netPCellConnected
             default:
                 self.state.networkProtection.status = UserText.netPCellDisconnected
             }
+        } else {
+            switch NetworkProtectionAccessController().networkProtectionAccessType() {
+            case .none, .waitlistAvailable, .waitlistJoined, .waitlistInvitedPendingTermsAcceptance:
+                self.state.networkProtection.status = VPNWaitlist.shared.settingsSubtitle
+            case .waitlistInvited, .inviteCodeInvited:
+                switch connectionStatus {
+                case .connected:
+                    self.state.networkProtection.status = UserText.netPCellConnected
+                default:
+                    self.state.networkProtection.status = UserText.netPCellDisconnected
+                }
+            }
         }
     }
     #endif
@@ -547,13 +565,8 @@ extension SettingsViewModel {
 #if NETWORK_PROTECTION
         case .netP:
             if #available(iOS 15, *) {
-                switch NetworkProtectionAccessController().networkProtectionAccessType() {
-                case .inviteCodeInvited, .waitlistInvited:
-                    Pixel.fire(pixel: .privacyProVPNSettings)
-                    pushViewController(legacyViewProvider.netP)
-                default:
-                    pushViewController(legacyViewProvider.netPWaitlist)
-                }
+                Pixel.fire(pixel: .privacyProVPNSettings)
+                pushViewController(legacyViewProvider.netP)
             }
 #endif
         
diff --git a/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift b/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
index 1aa70dac6f..c22131fd2d 100644
--- a/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
+++ b/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
@@ -17,6 +17,8 @@
 //  limitations under the License.
 //
 
+// swiftlint:disable file_length
+
 #if SUBSCRIPTION
 import BrowserServicesKit
 import Common
@@ -55,6 +57,12 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature, ObservableObjec
         static let subscriptionSelected = "subscriptionSelected"
         static let activateSubscription = "activateSubscription"
         static let featureSelected = "featureSelected"
+        // Pixels related events
+        static let subscriptionsMonthlyPriceClicked = "subscriptionsMonthlyPriceClicked"
+        static let subscriptionsYearlyPriceClicked = "subscriptionsYearlyPriceClicked"
+        static let subscriptionsUnknownPriceClicked = "subscriptionsUnknownPriceClicked"
+        static let subscriptionsAddEmailSuccess = "subscriptionsAddEmailSuccess"
+        static let subscriptionsWelcomeFaqClicked = "subscriptionsWelcomeFaqClicked"
     }
     
     struct ProductIDs {
@@ -123,7 +131,14 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature, ObservableObjec
         case Handlers.activateSubscription: return activateSubscription
         case Handlers.featureSelected: return featureSelected
         case Handlers.backToSettings: return backToSettings
+        // Pixel related events
+        case Handlers.subscriptionsMonthlyPriceClicked: return subscriptionsMonthlyPriceClicked
+        case Handlers.subscriptionsYearlyPriceClicked: return subscriptionsYearlyPriceClicked
+        case Handlers.subscriptionsUnknownPriceClicked: return subscriptionsUnknownPriceClicked
+        case Handlers.subscriptionsAddEmailSuccess: return subscriptionsAddEmailSuccess
+        case Handlers.subscriptionsWelcomeFaqClicked: return subscriptionsWelcomeFaqClicked
         default:
+            os_log("Unhandled web message: %s", log: .subscription, type: .error, methodName)
             return nil
         }
     }
@@ -175,13 +190,16 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature, ObservableObjec
                         
             switch await AppStorePurchaseFlow.subscriptionOptions() {
             case .success(let subscriptionOptions):
-                return subscriptionOptions
+                if AppDependencyProvider.shared.subscriptionFeatureAvailability.isSubscriptionPurchaseAllowed {
+                    return subscriptionOptions
+                } else {
+                    return SubscriptionOptions.empty
+                }
             case .failure:
                 os_log("Failed to obtain subscription options", log: .subscription, type: .error)
                 setTransactionError(.failedToGetSubscriptionOptions)
                 return nil
             }
-                        
         }
     }
     
@@ -298,28 +316,55 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature, ObservableObjec
         
         return nil
     }
-    
+
     func backToSettings(params: Any, original: WKScriptMessage) async -> Encodable? {
-           let accountManager = AccountManager()
-           if let accessToken = accountManager.accessToken,
-              case let .success(accountDetails) = await accountManager.fetchAccountDetails(with: accessToken) {
-               switch await SubscriptionService.getSubscription(accessToken: accessToken) {
-                   
-               case .success:
-                   accountManager.storeAccount(token: accessToken,
-                                               email: accountDetails.email,
-                                               externalID: accountDetails.externalID)
-                   onBackToSettings?()
-               default:
-                   break
-               }
-                                  
-           } else {
-               os_log("General error. Could not get account Details", log: .subscription, type: .error)
-               setTransactionError(.generalError)
-           }
-           return nil
-       }
+        let accountManager = AccountManager()
+        if let accessToken = accountManager.accessToken,
+           case let .success(accountDetails) = await accountManager.fetchAccountDetails(with: accessToken) {
+            switch await SubscriptionService.getSubscription(accessToken: accessToken) {
+
+            case .success:
+                accountManager.storeAccount(token: accessToken,
+                                            email: accountDetails.email,
+                                            externalID: accountDetails.externalID)
+                onBackToSettings?()
+            default:
+                break
+            }
+
+        } else {
+            os_log("General error. Could not get account Details", log: .subscription, type: .error)
+            setTransactionError(.generalError)
+        }
+        return nil
+    }
+
+    // MARK: Pixel related actions
+
+    func subscriptionsMonthlyPriceClicked(params: Any, original: WKScriptMessage) async -> Encodable? {
+        Pixel.fire(pixel: .privacyProOfferMonthlyPriceClick)
+        return nil
+    }
+
+    func subscriptionsYearlyPriceClicked(params: Any, original: WKScriptMessage) async -> Encodable? {
+        Pixel.fire(pixel: .privacyProOfferYearlyPriceClick)
+        return nil
+    }
+
+    func subscriptionsUnknownPriceClicked(params: Any, original: WKScriptMessage) async -> Encodable? {
+        // Not used
+        return nil
+    }
+
+    func subscriptionsAddEmailSuccess(params: Any, original: WKScriptMessage) async -> Encodable? {
+        UniquePixel.fire(pixel: .privacyProAddEmailSuccess)
+        return nil
+    }
+
+    func subscriptionsWelcomeFaqClicked(params: Any, original: WKScriptMessage) async -> Encodable? {
+        UniquePixel.fire(pixel: .privacyProWelcomeFAQClick)
+        return nil
+    }
 
     // MARK: Push actions (Push Data back to WebViews)
     enum SubscribeActionName: String {
@@ -373,3 +418,5 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature, ObservableObjec
 }
 
 #endif
+
+// swiftlint:enable file_length
diff --git a/DuckDuckGo/Suggestion.swift b/DuckDuckGo/Suggestion.swift
deleted file mode 100644
index 9499a984c3..0000000000
--- a/DuckDuckGo/Suggestion.swift
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  Suggestion.swift
-//  DuckDuckGo
-//
-//  Copyright © 2017 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import Foundation
-import Core
-
-struct Suggestion {
-
-    enum Source {
-        case remote
-        case local
-    }
-    
-    let source: Source
-    let suggestion: String
-    let url: URL?
-    
-}
-
-struct AutocompleteEntry: Decodable {
-
-    let phrase: String?
-    let isNav: Bool?
-
-}
diff --git a/DuckDuckGo/SuggestionTableViewCell.swift b/DuckDuckGo/SuggestionTableViewCell.swift
index 90a22c0106..bd5f14ff40 100644
--- a/DuckDuckGo/SuggestionTableViewCell.swift
+++ b/DuckDuckGo/SuggestionTableViewCell.swift
@@ -19,6 +19,7 @@
 
 import UIKit
 import Core
+import Suggestions
 
 class SuggestionTableViewCell: UITableViewCell {
     
@@ -29,23 +30,46 @@ class SuggestionTableViewCell: UITableViewCell {
     static let reuseIdentifier = "SuggestionTableViewCell"
 
     @IBOutlet weak var label: UILabel!
+    @IBOutlet weak var urlLabel: UILabel!
     @IBOutlet weak var typeImage: UIImageView!
     @IBOutlet weak var plusButton: UIButton!
 
     func updateFor(query: String, suggestion: Suggestion, with theme: Theme, isAddressBarAtBottom: Bool) {
 
-        switch suggestion.source {
-        case .local:
+        var text: String = ""
+        switch suggestion {
+        case .phrase(phrase: let phrase):
+            text = phrase
+            typeImage.image = UIImage(named: "Find-Search-20")
+            urlLabel.isHidden = true
+            self.accessibilityValue = UserText.voiceoverSuggestionTypeSearch
+
+        case .website(url: let url):
+            text = url.absoluteString
+            typeImage.image = UIImage(named: "Globe-20")
+            urlLabel.isHidden = true
+            self.accessibilityValue = UserText.voiceoverSuggestionTypeSearch
+
+        case .bookmark(title: let title, let url, _, _):
+            text = title
+            urlLabel.isHidden = url.isBookmarklet()
+            urlLabel.text = url.formattedForSuggestion()
             typeImage.image = UIImage(named: "Bookmark-20")
             self.accessibilityValue = UserText.voiceoverSuggestionTypeBookmark
-        case .remote:
-            if suggestion.url != nil {
-                typeImage.image = UIImage(named: "Globe-20")
-                self.accessibilityValue = UserText.voiceoverSuggestionTypeWebsite
+
+        case .historyEntry(title: let title, url: let url, _):
+            if url.isDuckDuckGoSearch, let searchQuery = url.searchQuery {
+                text = searchQuery
             } else {
-                typeImage.image = UIImage(named: "Find-Search-20")
-                self.accessibilityValue = UserText.voiceoverSuggestionTypeSearch
+                text = title ?? url.absoluteString
             }
+            urlLabel.isHidden = false
+            urlLabel.text = url.formattedForSuggestion()
+            typeImage.image = UIImage(named: "History-20")
+            self.accessibilityValue = UserText.voiceoverSuggestionTypeBookmark
+
+        case .unknown(value: let value):
+            assertionFailure("Unknown suggestion \(value)")
         }
 
         self.plusButton.accessibilityLabel = UserText.voiceoverActionAutocomplete
@@ -55,8 +79,9 @@ class SuggestionTableViewCell: UITableViewCell {
             self.plusButton.setImage(UIImage(named: "Arrow-Top-Left-24"), for: .normal)
         }
 
+        urlLabel.textColor = theme.tableCellTextColor
         styleText(query: query,
-                  text: suggestion.suggestion,
+                  text: text,
                   regularColor: theme.tableCellTextColor,
                   suggestionColor: theme.autocompleteSuggestionTextColor)
     }
@@ -86,3 +111,14 @@ class SuggestionTableViewCell: UITableViewCell {
         label.attributedText = newText
     }
 }
+
+private extension URL {
+
+    func formattedForSuggestion() -> String {
+        let string = absoluteString
+            .dropping(prefix: "https://")
+            .dropping(prefix: "http://")
+        return pathComponents.isEmpty ? string : string.dropping(suffix: "/")
+    }
+
+}
diff --git a/DuckDuckGo/SuggestionTrayViewController.swift b/DuckDuckGo/SuggestionTrayViewController.swift
index 228fc39de8..0439b9fb68 100644
--- a/DuckDuckGo/SuggestionTrayViewController.swift
+++ b/DuckDuckGo/SuggestionTrayViewController.swift
@@ -20,6 +20,9 @@
 import UIKit
 import Core
 import Bookmarks
+import Suggestions
+import Persistence
+import History
 
 class SuggestionTrayViewController: UIViewController {
     
@@ -41,8 +44,9 @@ class SuggestionTrayViewController: UIViewController {
     private var autocompleteController: AutocompleteViewController?
     private var favoritesOverlay: FavoritesOverlay?
     private var willRemoveAutocomplete = false
-    private let bookmarksSearch: BookmarksStringSearch
+    private let bookmarksDatabase: CoreDataDatabase
     private let favoritesModel: FavoritesListInteracting
+    private let historyCoordinator: HistoryCoordinating
 
     var selectedSuggestion: Suggestion? {
         autocompleteController?.selectedSuggestion
@@ -72,9 +76,10 @@ class SuggestionTrayViewController: UIViewController {
         }
     }
     
-    required init?(coder: NSCoder, favoritesViewModel: FavoritesListInteracting, bookmarksSearch: BookmarksStringSearch) {
+    required init?(coder: NSCoder, favoritesViewModel: FavoritesListInteracting, bookmarksDatabase: CoreDataDatabase, historyCoordinator: HistoryCoordinating) {
         self.favoritesModel = favoritesViewModel
-        self.bookmarksSearch = bookmarksSearch
+        self.bookmarksDatabase = bookmarksDatabase
+        self.historyCoordinator = historyCoordinator
         super.init(coder: coder)
     }
     
@@ -218,6 +223,7 @@ class SuggestionTrayViewController: UIViewController {
         controller.delegate = favoritesOverlayDelegate
         install(controller: controller, completion: onInstall)
         favoritesOverlay = controller
+        applyContentInset(contentInsets)
     }
     
     private func canDisplayAutocompleteSuggestions(forQuery query: String) -> Bool {
@@ -236,11 +242,12 @@ class SuggestionTrayViewController: UIViewController {
     }
     
     private func installAutocompleteSuggestions() {
-        let controller = AutocompleteViewController.loadFromStoryboard(bookmarksSearch: bookmarksSearch)
+        let controller = AutocompleteViewController.loadFromStoryboard(bookmarksDatabase: bookmarksDatabase, historyCoordinator: historyCoordinator)
         install(controller: controller)
         controller.delegate = autocompleteDelegate
         controller.presentationDelegate = self
         autocompleteController = controller
+        applyContentInset(contentInsets)
     }
 
     private func removeAutocomplete() {
@@ -270,7 +277,9 @@ class SuggestionTrayViewController: UIViewController {
         })
     }
     
+    var contentInsets = UIEdgeInsets.zero
     func applyContentInset(_ inset: UIEdgeInsets) {
+        self.contentInsets = inset
         autocompleteController?.tableView.contentInset = inset
         favoritesOverlay?.collectionView.contentInset = inset
     }
diff --git a/DuckDuckGo/UserText.swift b/DuckDuckGo/UserText.swift
index de7c59eef9..c09039a14d 100644
--- a/DuckDuckGo/UserText.swift
+++ b/DuckDuckGo/UserText.swift
@@ -673,6 +673,10 @@ In addition to the details entered into this form, your app issue report will co
     static let vpnAccessRevokedAlertActionSubscribe = NSLocalizedString("vpn.access-revoked.alert.action.subscribe", value: "Subscribe", comment: "Primary action for the alert when the subscription expires")
     static let vpnAccessRevokedAlertActionCancel = NSLocalizedString("vpn.access-revoked.alert.action.cancel", value: "Dismiss", comment: "Cancel action for the alert when the subscription expires")
 
+    static let vpnEarlyAccessOverAlertTitle = NSLocalizedString("vpn.early-access.over.alert.title", value: "DuckDuckGo VPN early access is over", comment: "Alert title for the alert when the early access period is over")
+    static let vpnEarlyAccessOverAlertMessage = NSLocalizedString("vpn.early-access.over.alert.message", value: "Thank you for being a tester! To continue using the VPN, subscribe to DuckDuckGo Privacy Pro and get 40% off with promo code THANKYOU\n\nOffer redeemable for a limited time only in the desktop version of the DuckDuckGo browser by U.S. testers  who install from duckduckgo.com/app", comment: "Alert message for the alert when the early access period is over")
+    static let vpnEarlyAccessOverAlertAction = NSLocalizedString("vpn.early-access.over.alert.action", value: "OK", comment: "Alert action for the alert when the early access period is over")
+
     // MARK: Notifications
     
     public static let macWaitlistAvailableNotificationTitle = NSLocalizedString("mac-waitlist.available.notification.title", value: "DuckDuckGo for Mac is ready!", comment: "Title for the macOS waitlist notification")
@@ -1027,12 +1031,14 @@ But if you *do* want a peek under the hood, you can find more information about
     public static let settingsPProActivationPendingTitle = NSLocalizedString("settings.subscription.activation.pending.title", value: "Your Subscription is Being Activated", comment: "Subscription activation pending title")
     public static let settingsPProActivationPendingDescription = NSLocalizedString("settings.subscription.activation.pending.description", value: "This is taking longer than usual, please check back later.", comment: "Subscription activation pending description")
     
-    
     // Customize Section
     public static let settingsCustomizeSection = NSLocalizedString("settings.customize", value: "Customize", comment: "Settings title for the customize section")
     public static let settingsKeyboard = NSLocalizedString("settings.keyboard", value: "Keyboard", comment: "Settings screen cell for Keyboard")
     public static let settingsPreviews = NSLocalizedString("settings.previews", value: "Long-Press Previews", comment: "Settings screen cell for long press previews")
     public static let settingsAutocomplete = NSLocalizedString("settings.autocomplete", value: "Autocomplete Suggestions", comment: "Settings screen cell for autocomplete")
+
+    // Hardcoded for the experiment
+    public static let settingsAutocompleteSubtitle = "See search suggestions, including your bookmarks and recently visited sites"
     public static let settingsVoiceSearch = NSLocalizedString("settings.voice.search", value: "Private Voice Search", comment: "Settings screen cell for voice search")
     public static let settingsAssociatedApps = NSLocalizedString("settings.associated.apps", value: "Open Links in Associated Apps", comment: "Settings screen cell for opening links in associated apps")
     public static let settingsAssociatedAppsDescription = NSLocalizedString("settings.associated.apps.description", value: "Disable to prevent links from automatically opening in other installed apps.", comment: "Description for associated apps description")
diff --git a/DuckDuckGo/VPNWaitlistTermsAndConditionsViewController.swift b/DuckDuckGo/VPNWaitlistTermsAndConditionsViewController.swift
index bbdd441eb3..a5186e7891 100644
--- a/DuckDuckGo/VPNWaitlistTermsAndConditionsViewController.swift
+++ b/DuckDuckGo/VPNWaitlistTermsAndConditionsViewController.swift
@@ -24,7 +24,7 @@ import SwiftUI
 import Core
 import Waitlist
 
-@available(iOS 15.0, *)
+@available(iOS 15, *)
 final class VPNWaitlistTermsAndConditionsViewController: UIViewController {
 
     override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
diff --git a/DuckDuckGo/VPNWaitlistView.swift b/DuckDuckGo/VPNWaitlistView.swift
index 22bd2c6b45..594cdfe6f9 100644
--- a/DuckDuckGo/VPNWaitlistView.swift
+++ b/DuckDuckGo/VPNWaitlistView.swift
@@ -24,7 +24,7 @@ import Core
 import Waitlist
 import DesignResourcesKit
 
-@available(iOS 15.0, *)
+@available(iOS 15, *)
 struct VPNWaitlistView: View {
 
     @EnvironmentObject var viewModel: WaitlistViewModel
diff --git a/DuckDuckGo/VPNWaitlistViewController.swift b/DuckDuckGo/VPNWaitlistViewController.swift
index f982f1bac4..8fa13949e2 100644
--- a/DuckDuckGo/VPNWaitlistViewController.swift
+++ b/DuckDuckGo/VPNWaitlistViewController.swift
@@ -24,7 +24,7 @@ import SwiftUI
 import Core
 import Waitlist
 
-@available(iOS 15.0, *)
+@available(iOS 15, *)
 final class VPNWaitlistViewController: UIViewController {
 
     private let viewModel: WaitlistViewModel
diff --git a/DuckDuckGo/en.lproj/Localizable.strings b/DuckDuckGo/en.lproj/Localizable.strings
index 8f665efa9c..a2fcdd0506 100644
--- a/DuckDuckGo/en.lproj/Localizable.strings
+++ b/DuckDuckGo/en.lproj/Localizable.strings
@@ -2346,6 +2346,15 @@ But if you *do* want a peek under the hood, you can find more information about
 /* Alert title for the alert when the Privacy Pro subscription expires */
 "vpn.access-revoked.alert.title" = "VPN disconnected due to expired subscription";
 
+/* Alert action for the alert when the early access period is over */
+"vpn.early-access.over.alert.action" = "OK";
+
+/* Alert message for the alert when the early access period is over */
+"vpn.early-access.over.alert.message" = "Thank you for being a tester! To continue using the VPN, subscribe to DuckDuckGo Privacy Pro and get 40% off with promo code THANKYOU\n\nOffer redeemable for a limited time only in the desktop version of the DuckDuckGo browser by U.S. testers  who install from duckduckgo.com/app";
+
+/* Alert title for the alert when the early access period is over */
+"vpn.early-access.over.alert.title" = "DuckDuckGo VPN early access is over";
+
 /* Title for the Cancel button of the VPN feedback form */
 "vpn.feedback-form.button.cancel" = "Cancel";
 
diff --git a/DuckDuckGoTests/AutocompleteRequestTests.swift b/DuckDuckGoTests/AutocompleteRequestTests.swift
deleted file mode 100644
index d121d78849..0000000000
--- a/DuckDuckGoTests/AutocompleteRequestTests.swift
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-//  AutocompleteRequestTests.swift
-//  DuckDuckGo
-//
-//  Copyright © 2021 DuckDuckGo. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//  http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-import Foundation
-
-import XCTest
-@testable import DuckDuckGo
-@testable import Core
-import OHHTTPStubs
-import OHHTTPStubsSwift
-
-class AutocompleteRequestTests: XCTestCase {
-
-    let request = (try? AutocompleteRequest(query: "test"))!
-
-    override func tearDown() {
-        HTTPStubs.removeAllStubs()
-        super.tearDown()
-    }
-
-    func testWhenRequestIsMadeThenHasNavParameter() throws {
-        stub(condition: {
-            return $0.url?.getParameter(named: "nav") == "1"
-        }, response: { _ in
-            return HTTPStubsResponse(data: """
-                []
-                """.data(using: .utf8)!, statusCode: 200, headers: nil)
-        })
-
-        let expect = expectation(description: "test")
-        request.execute { _, _ in
-            expect.fulfill()
-        }
-        waitForExpectations(timeout: 1.0, handler: nil)
-    }
-
-    func testWhenModernResponseThenURLsAreNotNilForPhrasesWithNav() throws {
-        stub(condition: {
-            return $0.url?.path == "/ac"
-        }, response: { _ in
-            return HTTPStubsResponse(data: """
-                [ { "phrase": "healthcare.gov", "isNav": true }, {  "phrase": "healthcare.gov", "isNav": false } ]
-                """.data(using: .utf8)!, statusCode: 200, headers: nil)
-        })
-
-        let expect = expectation(description: "test")
-        request.execute { suggestions, _ in
-            XCTAssertNotNil(suggestions?[0].url)
-            XCTAssertNil(suggestions?[1].url)
-            expect.fulfill()
-        }
-        waitForExpectations(timeout: 1.0, handler: nil)
-    }
-
-    func testWhenResponseContainsLegacyResultsThenURLsAreNotNilForWebLikeSuggestions() throws {
-        stub(condition: {
-            return $0.url?.path == "/ac"
-        }, response: { _ in
-            return HTTPStubsResponse(data: """
-                [ { "phrase": "healthcare.gov" }, { "phrase": "test" } ]
-                """.data(using: .utf8)!, statusCode: 200, headers: nil)
-        })
-
-        let expect = expectation(description: "test")
-        request.execute { suggestions, _ in
-            XCTAssertNotNil(suggestions?[0].url)
-            XCTAssertNil(suggestions?[1].url)
-            expect.fulfill()
-        }
-        waitForExpectations(timeout: 1.0, handler: nil)
-    }
-
-    func testWhenResponseContainsUnexpectedPropertiesThenCanParseResponse() throws {
-        stub(condition: {
-            return $0.url?.path == "/ac"
-        }, response: { _ in
-            return HTTPStubsResponse(data: """
-                [ { "phrase": "test", "isNav": false }, { "phrase": "test", "random": 22 } ]
-                """.data(using: .utf8)!, statusCode: 200, headers: nil)
-        })
-
-        let expect = expectation(description: "test")
-        request.execute { suggestions, _ in
-            XCTAssertEqual(2, suggestions?.count)
-            expect.fulfill()
-        }
-        waitForExpectations(timeout: 1.0, handler: nil)
-    }
-
-}
diff --git a/DuckDuckGoTests/HistoryCaptureTests.swift b/DuckDuckGoTests/HistoryCaptureTests.swift
index 78b65f955a..c745dec9bb 100644
--- a/DuckDuckGoTests/HistoryCaptureTests.swift
+++ b/DuckDuckGoTests/HistoryCaptureTests.swift
@@ -35,20 +35,6 @@ final class HistoryCaptureTests: XCTestCase {
         XCTAssertEqual([URL.example], mockHistoryCoordinator.addVisitCalls)
     }
 
-    func test_whenURLIsDDGQuery_ThenOnlyQueryIsStored() {
-        let capture = makeCapture()
-        capture.webViewDidCommit(url: URL.makeSearchURL(query: "test")!)
-        XCTAssertEqual(1, mockHistoryCoordinator.addVisitCalls.count)
-        XCTAssertEqual("https://duckduckgo.com?q=test", mockHistoryCoordinator.addVisitCalls[0].absoluteString)
-    }
-
-    func test_whenURLIsDDGQueryWithExtraParams_ThenOnlyQueryIsStored() {
-        let capture = makeCapture()
-        capture.webViewDidCommit(url: URL.makeSearchURL(query: "test")!.appendingParameter(name: "ia", value: "web"))
-        XCTAssertEqual(1, mockHistoryCoordinator.addVisitCalls.count)
-        XCTAssertEqual("https://duckduckgo.com?q=test", mockHistoryCoordinator.addVisitCalls[0].absoluteString)
-    }
-
     func test_whenTitleIsUpdatedForMatchingURL_ThenTitleIsSaved() {
         let capture = makeCapture()
         capture.webViewDidCommit(url: URL.example)
diff --git a/DuckDuckGoTests/MockDependencyProvider.swift b/DuckDuckGoTests/MockDependencyProvider.swift
index 8666c34788..b49e71fd48 100644
--- a/DuckDuckGoTests/MockDependencyProvider.swift
+++ b/DuckDuckGoTests/MockDependencyProvider.swift
@@ -21,9 +21,11 @@ import Foundation
 import Core
 import BrowserServicesKit
 import DDGSync
+import Subscription
 @testable import DuckDuckGo
 
 class MockDependencyProvider: DependencyProvider {
+
     var appSettings: AppSettings
     var variantManager: VariantManager
     var featureFlagger: FeatureFlagger
@@ -38,6 +40,7 @@ class MockDependencyProvider: DependencyProvider {
     var configurationManager: ConfigurationManager
     var userBehaviorMonitor: UserBehaviorMonitor
     var toggleProtectionsCounter: ToggleProtectionsCounter
+    var subscriptionFeatureAvailability: SubscriptionFeatureAvailability
 
     init() {
         let defaultProvider = AppDependencyProvider()
@@ -55,5 +58,6 @@ class MockDependencyProvider: DependencyProvider {
         configurationManager = defaultProvider.configurationManager
         userBehaviorMonitor = defaultProvider.userBehaviorMonitor
         toggleProtectionsCounter = defaultProvider.toggleProtectionsCounter
+        subscriptionFeatureAvailability = defaultProvider.subscriptionFeatureAvailability
     }
 }
diff --git a/DuckDuckGoTests/NetworkProtectionFeatureVisibilityTests.swift b/DuckDuckGoTests/NetworkProtectionFeatureVisibilityTests.swift
new file mode 100644
index 0000000000..24ce4c9297
--- /dev/null
+++ b/DuckDuckGoTests/NetworkProtectionFeatureVisibilityTests.swift
@@ -0,0 +1,122 @@
+//
+//  NetworkProtectionFeatureVisibilityTests.swift
+//  DuckDuckGo
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+@testable import DuckDuckGo
+
+/// Test all permutations according to https://app.asana.com/0/0/1206812323779606/f
+final class NetworkProtectionFeatureVisibilityTests: XCTestCase {
+    func testPrivacyProNotYetLaunched() {
+        // Current waitlist user -> VPN works as usual, no thank-you, no entitlement check
+        let mockWithVPNAccess = NetworkProtectionFeatureVisibilityMocks(with: [.isWaitlistBetaActive, .isWaitlistUser])
+        XCTAssertFalse(mockWithVPNAccess.shouldMonitorEntitlement())
+        XCTAssertTrue(mockWithVPNAccess.shouldKeepVPNAccessViaWaitlist())
+        XCTAssertFalse(mockWithVPNAccess.shouldShowThankYouMessaging())
+        XCTAssertTrue(mockWithVPNAccess.shouldShowVPNShortcut())
+
+        // Not current waitlist user -> Show nothing, use nothing
+        let mockWithBetaActive = NetworkProtectionFeatureVisibilityMocks(with: [.isWaitlistBetaActive])
+        XCTAssertFalse(mockWithBetaActive.shouldMonitorEntitlement())
+        XCTAssertFalse(mockWithBetaActive.shouldKeepVPNAccessViaWaitlist())
+        XCTAssertFalse(mockWithBetaActive.shouldShowThankYouMessaging())
+        XCTAssertFalse(mockWithBetaActive.shouldShowVPNShortcut())
+
+        // Waitlist beta OFF, current waitlist user -> Show nothing, use nothing
+        let mockWithBetaInactive = NetworkProtectionFeatureVisibilityMocks(with: [.isWaitlistUser])
+        XCTAssertFalse(mockWithBetaInactive.shouldMonitorEntitlement())
+        XCTAssertFalse(mockWithBetaInactive.shouldKeepVPNAccessViaWaitlist())
+        XCTAssertFalse(mockWithBetaInactive.shouldShowThankYouMessaging())
+        XCTAssertFalse(mockWithBetaInactive.shouldShowVPNShortcut())
+
+        // Waitlist beta OFF, not current waitlist user -> Show nothing, use nothing
+        let mockWithNothing = NetworkProtectionFeatureVisibilityMocks(with: [])
+        XCTAssertFalse(mockWithNothing.shouldMonitorEntitlement())
+        XCTAssertFalse(mockWithNothing.shouldKeepVPNAccessViaWaitlist())
+        XCTAssertFalse(mockWithNothing.shouldShowThankYouMessaging())
+        XCTAssertFalse(mockWithNothing.shouldShowVPNShortcut())
+    }
+
+    func testPrivacyProLaunched() {
+        let baseMock = NetworkProtectionFeatureVisibilityMocks(with: [.isPrivacyProLaunched])
+
+        // Current waitlist user -> Show thank-you, enforce entitlement check, no more VPN use
+        let mockWithVPNAccess = baseMock.adding([.isWaitlistUser, .isWaitlistBetaActive])
+        XCTAssertTrue(mockWithVPNAccess.shouldMonitorEntitlement())
+        XCTAssertFalse(mockWithVPNAccess.shouldKeepVPNAccessViaWaitlist())
+        XCTAssertTrue(mockWithVPNAccess.shouldShowThankYouMessaging())
+        XCTAssertTrue(mockWithVPNAccess.shouldShowVPNShortcut())
+
+        // Not current waitlist user -> Enforce entitlement check, no more VPN use, no thank-you
+        let mockWithBetaActive = baseMock.adding([.isWaitlistBetaActive])
+        XCTAssertTrue(mockWithBetaActive.shouldMonitorEntitlement())
+        XCTAssertFalse(mockWithBetaActive.shouldKeepVPNAccessViaWaitlist())
+        XCTAssertFalse(mockWithBetaActive.shouldShowThankYouMessaging())
+        XCTAssertTrue(mockWithBetaActive.shouldShowVPNShortcut())
+
+        // Waitlist beta OFF, current waitlist user -> Show thank-you, enforce entitlement check, no more VPN use
+        let mockWithBetaInactive = baseMock.adding([.isWaitlistUser])
+        XCTAssertTrue(mockWithBetaInactive.shouldMonitorEntitlement())
+        XCTAssertFalse(mockWithBetaInactive.shouldKeepVPNAccessViaWaitlist())
+        XCTAssertTrue(mockWithBetaInactive.shouldShowThankYouMessaging())
+        XCTAssertTrue(mockWithBetaInactive.shouldShowVPNShortcut())
+
+        // Waitlist beta OFF, not current wailist user -> Enforce entitlement check, nothing else
+        let mockWithNothingElse = baseMock
+        XCTAssertTrue(mockWithNothingElse.shouldMonitorEntitlement())
+        XCTAssertFalse(mockWithNothingElse.shouldKeepVPNAccessViaWaitlist())
+        XCTAssertFalse(mockWithNothingElse.shouldShowThankYouMessaging())
+        XCTAssertTrue(mockWithNothingElse.shouldShowVPNShortcut())
+    }
+}
+
+struct NetworkProtectionFeatureVisibilityMocks: NetworkProtectionFeatureVisibility {
+    struct Options: OptionSet {
+        let rawValue: Int
+
+        static let isWaitlistBetaActive = Options(rawValue: 1 << 0)
+        static let isWaitlistUser = Options(rawValue: 1 << 1)
+        static let isPrivacyProLaunched = Options(rawValue: 1 << 2)
+    }
+
+    let options: Options
+
+    init(with options: Options) {
+        self.options = options
+    }
+
+    func adding(_ additionalOptions: Options) -> NetworkProtectionFeatureVisibilityMocks {
+        NetworkProtectionFeatureVisibilityMocks(with: options.union(additionalOptions))
+    }
+
+    func isWaitlistBetaActive() -> Bool {
+        options.contains(.isWaitlistBetaActive)
+    }
+
+    func isWaitlistUser() -> Bool {
+        options.contains(.isWaitlistUser)
+    }
+
+    func isPrivacyProLaunched() -> Bool {
+        options.contains(.isPrivacyProLaunched)
+    }
+
+    func shouldMonitorEntitlement() -> Bool {
+        isPrivacyProLaunched()
+    }
+}
diff --git a/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift b/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift
index 132171dcad..48b697441d 100644
--- a/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift
+++ b/PacketTunnelProvider/NetworkProtection/NetworkProtectionPacketTunnelProvider.swift
@@ -234,23 +234,23 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
     }
 
     @objc init() {
-#if SUBSCRIPTION && ALPHA
-        let isSubscriptionEnabled = true
-        let tokenStore = NetworkProtectionKeychainTokenStore(
-            keychainType: .dataProtection(.unspecified),
-            errorEvents: nil,
-            isSubscriptionEnabled: isSubscriptionEnabled,
-            accessTokenProvider: { AccountManager().accessToken }
-        )
-#else
-        let isSubscriptionEnabled = false
+        let featureVisibility = NetworkProtectionVisibilityForTunnelProvider()
+        let isSubscriptionEnabled = featureVisibility.isPrivacyProLaunched()
+        let accessTokenProvider: () -> String? = {
+#if SUBSCRIPTION
+            if featureVisibility.shouldMonitorEntitlement() {
+                return { AccountManager().accessToken }
+            }
+#endif
+            return { nil }
+        }()
         let tokenStore = NetworkProtectionKeychainTokenStore(
             keychainType: .dataProtection(.unspecified),
             errorEvents: nil,
             isSubscriptionEnabled: isSubscriptionEnabled,
-            accessTokenProvider: { nil }
+            accessTokenProvider: accessTokenProvider
         )
-#endif
+
         let errorStore = NetworkProtectionTunnelErrorStore()
         let notificationsPresenter = NetworkProtectionUNNotificationPresenter()
         let settings = VPNSettings(defaults: .networkProtectionGroupDefaults)
@@ -318,8 +318,14 @@ final class NetworkProtectionPacketTunnelProvider: PacketTunnelProvider {
     }
 
     private static func entitlementCheck() async -> Result<Bool, Error> {
-#if SUBSCRIPTION && ALPHA
-        SubscriptionPurchaseEnvironment.currentServiceEnvironment = .staging
+#if SUBSCRIPTION
+        guard NetworkProtectionVisibilityForTunnelProvider().shouldMonitorEntitlement() else {
+            return .success(true)
+        }
+
+        if VPNSettings(defaults: .networkProtectionGroupDefaults).selectedEnvironment == .staging {
+            SubscriptionPurchaseEnvironment.currentServiceEnvironment = .staging
+        }
 
         let result = await AccountManager(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
             .hasEntitlement(for: .networkProtection, cachePolicy: .reloadIgnoringLocalCacheData)
diff --git a/PacketTunnelProvider/PrivacyInfo.xcprivacy b/PacketTunnelProvider/PrivacyInfo.xcprivacy
new file mode 100644
index 0000000000..dd6881b47e
--- /dev/null
+++ b/PacketTunnelProvider/PrivacyInfo.xcprivacy
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>1C8F.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/Widgets/PrivacyInfo.xcprivacy b/Widgets/PrivacyInfo.xcprivacy
new file mode 100644
index 0000000000..dd6881b47e
--- /dev/null
+++ b/Widgets/PrivacyInfo.xcprivacy
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>1C8F.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/submodules/privacy-reference-tests b/submodules/privacy-reference-tests
index a603ff9af2..6b7ad1e7f1 160000
--- a/submodules/privacy-reference-tests
+++ b/submodules/privacy-reference-tests
@@ -1 +1 @@
-Subproject commit a603ff9af22ca3ff7ce2e7ffbfe18c447d9f23e8
+Subproject commit 6b7ad1e7f15270f9dfeb58a272199f4d57c3eb22