diff --git a/app/components/vendor_outage_alert_component.rb b/app/components/vendor_outage_alert_component.rb
index dbf7a21d104..822ff103efa 100644
--- a/app/components/vendor_outage_alert_component.rb
+++ b/app/components/vendor_outage_alert_component.rb
@@ -37,6 +37,6 @@ def outages
   end
 
   def vendor_status
-    @vendor_status ||= VendorStatus.new
+    @vendor_status ||= OutageStatus.new
   end
 end
diff --git a/app/controllers/concerns/idv/verify_info_concern.rb b/app/controllers/concerns/idv/verify_info_concern.rb
index 9e1acd7dce2..4f3dd6402a7 100644
--- a/app/controllers/concerns/idv/verify_info_concern.rb
+++ b/app/controllers/concerns/idv/verify_info_concern.rb
@@ -114,7 +114,7 @@ def async_state_done(current_async_state)
         move_applicant_to_idv_session
         idv_session.mark_verify_info_step_complete!
         idv_session.invalidate_steps_after_verify_info!
-        redirect_to idv_phone_url
+        redirect_to next_step_url
       else
         idv_session.invalidate_verify_info_step!
       end
@@ -122,6 +122,11 @@ def async_state_done(current_async_state)
       analytics.idv_doc_auth_verify_proofing_results(**form_response.to_h)
     end
 
+    def next_step_url
+      return idv_gpo_url if OutageStatus.new.gpo_only?
+      idv_phone_url
+    end
+
     def summarize_result_and_throttle_failures(summary_result)
       if summary_result.success?
         add_proofing_components
diff --git a/app/controllers/idv/doc_auth_controller.rb b/app/controllers/idv/doc_auth_controller.rb
index 2861a53eb7f..b2e55231a30 100644
--- a/app/controllers/idv/doc_auth_controller.rb
+++ b/app/controllers/idv/doc_auth_controller.rb
@@ -70,11 +70,30 @@ def flow_session
     end
 
     def check_for_outage
-      if VendorStatus.new.any_ial2_vendor_outage?
-        session[:vendor_outage_redirect] = current_step
-        session[:vendor_outage_redirect_from_idv] = true
-        redirect_to vendor_outage_url
-      end
+      return if flow_session[:skip_vendor_outage]
+
+      return redirect_for_proofing_vendor_outage if OutageStatus.new.any_idv_vendor_outage?
+      return redirect_for_gpo_only if FeatureManagement.idv_gpo_only?
+    end
+
+    def redirect_for_proofing_vendor_outage
+      session[:vendor_outage_redirect] = current_step
+      session[:vendor_outage_redirect_from_idv] = true
+
+      redirect_to vendor_outage_url
+    end
+
+    def redirect_for_gpo_only
+      return redirect_to vendor_outage_url unless FeatureManagement.gpo_verification_enabled?
+
+      # During a phone outage, skip the hybrid handoff
+      # step and go straight to document upload
+      flow_session[:skip_upload_step] = true unless FeatureManagement.idv_allow_hybrid_flow?
+
+      session[:vendor_outage_redirect] = current_step
+      session[:vendor_outage_redirect_from_idv] = true
+
+      redirect_to idv_mail_only_warning_url
     end
   end
 end
diff --git a/app/controllers/idv/gpo_only_warning_controller.rb b/app/controllers/idv/gpo_only_warning_controller.rb
new file mode 100644
index 00000000000..8735f8fa13f
--- /dev/null
+++ b/app/controllers/idv/gpo_only_warning_controller.rb
@@ -0,0 +1,17 @@
+module Idv
+  class GpoOnlyWarningController < ApplicationController
+    include IdvSession
+    include StepIndicatorConcern
+
+    before_action :confirm_two_factor_authenticated
+
+    def show
+      user_session['idv/doc_auth'][:skip_vendor_outage] = true
+      render :show, locals: { current_sp:, exit_url: }
+    end
+
+    def exit_url
+      current_sp&.return_to_sp_url || account_path
+    end
+  end
+end
diff --git a/app/controllers/idv/phone_controller.rb b/app/controllers/idv/phone_controller.rb
index ab424f8da29..6afe9035396 100644
--- a/app/controllers/idv/phone_controller.rb
+++ b/app/controllers/idv/phone_controller.rb
@@ -62,7 +62,7 @@ def throttle
 
     def redirect_to_next_step
       if phone_confirmation_required?
-        if VendorStatus.new.all_phone_vendor_outage?
+        if OutageStatus.new.all_phone_vendor_outage?
           redirect_to vendor_outage_path(from: :idv_phone)
         else
           send_phone_confirmation_otp_and_handle_result
@@ -182,7 +182,7 @@ def new_phone_added?
 
     def gpo_letter_available
       return @gpo_letter_available if defined?(@gpo_letter_available)
-      @gpo_letter_available ||= FeatureManagement.enable_gpo_verification? &&
+      @gpo_letter_available ||= FeatureManagement.gpo_verification_enabled? &&
                                 !Idv::GpoMail.new(current_user).mail_spammed?
     end
 
diff --git a/app/controllers/idv/phone_errors_controller.rb b/app/controllers/idv/phone_errors_controller.rb
index 31cfab5e2ec..fed541d4730 100644
--- a/app/controllers/idv/phone_errors_controller.rb
+++ b/app/controllers/idv/phone_errors_controller.rb
@@ -56,7 +56,7 @@ def track_event(type:)
     # rubocop:disable Naming/MemoizedInstanceVariableName
     def set_gpo_letter_available
       return @gpo_letter_available if defined?(@gpo_letter_available)
-      @gpo_letter_available ||= FeatureManagement.enable_gpo_verification? &&
+      @gpo_letter_available ||= FeatureManagement.gpo_verification_enabled? &&
                                 !Idv::GpoMail.new(current_user).mail_spammed?
     end
     # rubocop:enable Naming/MemoizedInstanceVariableName
diff --git a/app/controllers/sign_up/registrations_controller.rb b/app/controllers/sign_up/registrations_controller.rb
index 19204b5c997..51a9ddb7e71 100644
--- a/app/controllers/sign_up/registrations_controller.rb
+++ b/app/controllers/sign_up/registrations_controller.rb
@@ -72,7 +72,7 @@ def sp_request_id
     end
 
     def redirect_if_ial2_and_vendor_outage
-      return unless ial2_requested? && VendorStatus.new.any_ial2_vendor_outage?
+      return unless ial2_requested? && OutageStatus.new.any_idv_vendor_outage?
 
       session[:vendor_outage_redirect] = CREATE_ACCOUNT
       return redirect_to vendor_outage_url
diff --git a/app/controllers/users/phones_controller.rb b/app/controllers/users/phones_controller.rb
index 22c3210acd9..ca4f3988773 100644
--- a/app/controllers/users/phones_controller.rb
+++ b/app/controllers/users/phones_controller.rb
@@ -31,7 +31,7 @@ def create
     private
 
     def redirect_if_phone_vendor_outage
-      return unless VendorStatus.new.all_phone_vendor_outage?
+      return unless OutageStatus.new.all_phone_vendor_outage?
       redirect_to vendor_outage_path(from: :users_phones)
     end
 
diff --git a/app/controllers/users/two_factor_authentication_controller.rb b/app/controllers/users/two_factor_authentication_controller.rb
index 7b152845a77..b413a5bc881 100644
--- a/app/controllers/users/two_factor_authentication_controller.rb
+++ b/app/controllers/users/two_factor_authentication_controller.rb
@@ -43,7 +43,7 @@ def non_phone_redirect
     end
 
     def phone_redirect
-      return unless phone_enabled? && !VendorStatus.new.any_phone_vendor_outage?
+      return unless phone_enabled? && !OutageStatus.new.any_phone_vendor_outage?
       validate_otp_delivery_preference_and_send_code
       true
     end
@@ -145,7 +145,7 @@ def redirect_if_blank_phone
     end
 
     def redirect_to_vendor_outage_if_phone_only
-      return unless VendorStatus.new.all_phone_vendor_outage? &&
+      return unless OutageStatus.new.all_phone_vendor_outage? &&
                     phone_enabled? &&
                     !MfaPolicy.new(current_user).multiple_factors_enabled?
       redirect_to vendor_outage_path(from: :two_factor_authentication)
diff --git a/app/controllers/vendor_outage_controller.rb b/app/controllers/vendor_outage_controller.rb
index ab47989c85e..fdc023b203f 100644
--- a/app/controllers/vendor_outage_controller.rb
+++ b/app/controllers/vendor_outage_controller.rb
@@ -1,6 +1,6 @@
 class VendorOutageController < ApplicationController
   def show
-    vendor_status = VendorStatus.new(
+    vendor_status = OutageStatus.new(
       sp: current_sp,
       from: session.delete(:vendor_outage_redirect),
       from_idv: session.delete(:vendor_outage_redirect_from_idv),
@@ -17,7 +17,7 @@ def from_idv_phone?
   end
 
   def gpo_letter_available?
-    FeatureManagement.enable_gpo_verification? &&
+    FeatureManagement.gpo_verification_enabled? &&
       current_user &&
       !Idv::GpoMail.new(current_user).mail_spammed?
   end
diff --git a/app/forms/new_phone_form.rb b/app/forms/new_phone_form.rb
index af4f76885e0..068310eafea 100644
--- a/app/forms/new_phone_form.rb
+++ b/app/forms/new_phone_form.rb
@@ -46,11 +46,11 @@ def submit(params)
   end
 
   def delivery_preference_sms?
-    !VendorStatus.new.vendor_outage?(:sms)
+    !OutageStatus.new.vendor_outage?(:sms)
   end
 
   def delivery_preference_voice?
-    VendorStatus.new.vendor_outage?(:sms) || setup_voice_preference?
+    OutageStatus.new.vendor_outage?(:sms) || setup_voice_preference?
   end
 
   # @return [Telephony::PhoneNumberInfo, nil]
diff --git a/app/presenters/idv/gpo_presenter.rb b/app/presenters/idv/gpo_presenter.rb
index 1ee0cb8ed12..9c7b210bb3e 100644
--- a/app/presenters/idv/gpo_presenter.rb
+++ b/app/presenters/idv/gpo_presenter.rb
@@ -18,6 +18,7 @@ def button
     end
 
     def fallback_back_path
+      return idv_verify_info_path if OutageStatus.new.any_phone_vendor_outage?
       user_needs_address_otp_verification? ? idv_gpo_verify_path : idv_phone_path
     end
 
@@ -25,6 +26,22 @@ def resend_requested?
       current_user.decorate.pending_profile_requires_verification?
     end
 
+    def back_or_cancel_partial
+      if OutageStatus.new.gpo_only?
+        'idv/doc_auth/cancel'
+      else
+        'idv/shared/back'
+      end
+    end
+
+    def back_or_cancel_parameters
+      if OutageStatus.new.gpo_only?
+        { step: 'gpo' }
+      else
+        { fallback_path: fallback_back_path }
+      end
+    end
+
     private
 
     def user_needs_address_otp_verification?
diff --git a/app/presenters/two_factor_authentication/phone_selection_presenter.rb b/app/presenters/two_factor_authentication/phone_selection_presenter.rb
index f452e2142e1..1954589607c 100644
--- a/app/presenters/two_factor_authentication/phone_selection_presenter.rb
+++ b/app/presenters/two_factor_authentication/phone_selection_presenter.rb
@@ -21,7 +21,7 @@ def mfa_configuration_count
     end
 
     def disabled?
-      VendorStatus.new.all_phone_vendor_outage? || user&.phone_configurations&.any?
+      OutageStatus.new.all_phone_vendor_outage? || user&.phone_configurations&.any?
     end
   end
 end
diff --git a/app/presenters/two_factor_authentication/sms_selection_presenter.rb b/app/presenters/two_factor_authentication/sms_selection_presenter.rb
index 081efd9d847..3226ae6adc3 100644
--- a/app/presenters/two_factor_authentication/sms_selection_presenter.rb
+++ b/app/presenters/two_factor_authentication/sms_selection_presenter.rb
@@ -16,7 +16,7 @@ def info
     end
 
     def disabled?
-      VendorStatus.new.vendor_outage?(:sms)
+      OutageStatus.new.vendor_outage?(:sms)
     end
   end
 end
diff --git a/app/presenters/two_factor_authentication/voice_selection_presenter.rb b/app/presenters/two_factor_authentication/voice_selection_presenter.rb
index b2e4a061785..369878c5e5d 100644
--- a/app/presenters/two_factor_authentication/voice_selection_presenter.rb
+++ b/app/presenters/two_factor_authentication/voice_selection_presenter.rb
@@ -16,7 +16,7 @@ def info
     end
 
     def disabled?
-      VendorStatus.new.vendor_outage?(:voice)
+      OutageStatus.new.vendor_outage?(:voice)
     end
   end
 end
diff --git a/app/services/idv/steps/welcome_step.rb b/app/services/idv/steps/welcome_step.rb
index 1a5744a5e94..67116884635 100644
--- a/app/services/idv/steps/welcome_step.rb
+++ b/app/services/idv/steps/welcome_step.rb
@@ -12,7 +12,10 @@ def self.analytics_submitted_event
       end
 
       def call
+        flow_session[:skip_upload_step] = true unless FeatureManagement.idv_allow_hybrid_flow?
+
         return no_camera_redirect if params[:no_camera]
+
         create_document_capture_session(document_capture_session_uuid_key)
         cancel_previous_in_person_enrollments
       end
diff --git a/app/services/vendor_status.rb b/app/services/outage_status.rb
similarity index 82%
rename from app/services/vendor_status.rb
rename to app/services/outage_status.rb
index 32af74b2370..33a7950ba54 100644
--- a/app/services/vendor_status.rb
+++ b/app/services/outage_status.rb
@@ -1,4 +1,4 @@
-class VendorStatus
+class OutageStatus
   include ActionView::Helpers::TranslationHelper
 
   def initialize(from: nil, from_idv: nil, sp: nil)
@@ -7,9 +7,9 @@ def initialize(from: nil, from_idv: nil, sp: nil)
     @sp = sp
   end
 
-  IAL2_VENDORS = %i[acuant lexisnexis_instant_verify lexisnexis_trueid].freeze
+  IDV_VENDORS = %i[acuant lexisnexis_instant_verify lexisnexis_trueid].freeze
   PHONE_VENDORS = %i[sms voice].freeze
-  ALL_VENDORS = (IAL2_VENDORS + PHONE_VENDORS).freeze
+  ALL_VENDORS = (IDV_VENDORS + PHONE_VENDORS).freeze
 
   def vendor_outage?(vendor)
     status = case vendor
@@ -37,8 +37,8 @@ def all_vendor_outage?(vendors = ALL_VENDORS)
     vendors.all? { |vendor| vendor_outage?(vendor) }
   end
 
-  def any_ial2_vendor_outage?
-    any_vendor_outage?(IAL2_VENDORS)
+  def any_idv_vendor_outage?
+    any_vendor_outage?(IDV_VENDORS)
   end
 
   def any_phone_vendor_outage?
@@ -49,6 +49,16 @@ def all_phone_vendor_outage?
     all_vendor_outage?(PHONE_VENDORS)
   end
 
+  def gpo_only?
+    IdentityConfig.store.feature_idv_force_gpo_verification_enabled ||
+      any_phone_vendor_outage?
+  end
+
+  def allow_hybrid_flow?
+    IdentityConfig.store.feature_idv_hybrid_flow_enabled &&
+      !any_phone_vendor_outage?
+  end
+
   def from_idv?
     from_idv
   end
@@ -58,7 +68,7 @@ def from_idv?
   #
   # @return [String, nil] the localized message.
   def outage_message
-    if any_ial2_vendor_outage?
+    if any_idv_vendor_outage?
       if from_idv?
         if sp
           t('vendor_outage.blocked.idv.with_sp', service_provider: sp.friendly_name)
diff --git a/app/views/idv/gpo/index.html.erb b/app/views/idv/gpo/index.html.erb
index ac0e48dd06b..69ec0f3f07b 100644
--- a/app/views/idv/gpo/index.html.erb
+++ b/app/views/idv/gpo/index.html.erb
@@ -42,4 +42,4 @@
       ],
     ) %>
 
-<%= render 'idv/shared/back', fallback_path: @presenter.fallback_back_path %>
+<%= render @presenter.back_or_cancel_partial, @presenter.back_or_cancel_parameters %>
diff --git a/app/views/idv/gpo_only_warning/show.html.erb b/app/views/idv/gpo_only_warning/show.html.erb
new file mode 100644
index 00000000000..78e7a4c77e0
--- /dev/null
+++ b/app/views/idv/gpo_only_warning/show.html.erb
@@ -0,0 +1,53 @@
+<%= render StepIndicatorComponent.new(
+      steps: step_indicator_steps,
+      current_step: :getting_started,
+      locale_scope: 'idv',
+      class: 'margin-x-neg-2 margin-top-neg-4 tablet:margin-x-neg-6 tablet:margin-top-neg-4',
+    ) %>
+
+<%= render StatusPageComponent.new(status: :warning) do |c| %>
+  <% c.header { t('vendor_outage.alerts.pinpoint.idv.header') } %>
+  <p>
+    <%= t('vendor_outage.alerts.pinpoint.idv.message_html', app_name: APP_NAME, sp_name: current_sp&.friendly_name || APP_NAME) %>
+  </p>
+  <span><%= t('vendor_outage.alerts.pinpoint.idv.options_prompt') %></span>
+  <ul class="margin-bottom-5">
+    <% t('vendor_outage.alerts.pinpoint.idv.options_html', status_page_url: StatusPage.base_url).each do | option | %>
+      <li>
+        <%= option %>
+      </li>
+    <% end %>
+  </ul>
+  <% c.action_button(
+       action: ->(**tag_options, &block) do
+         link_to(idv_doc_auth_step_path(step: :welcome), **tag_options, &block)
+       end,
+       big: true,
+       wide: true,
+       class: 'usa-button',
+     ).with_content(t('doc_auth.buttons.continue')) %>
+  <% c.action_button(
+       action: ->(**tag_options, &block) do
+         link_to(exit_url, **tag_options, &block)
+       end,
+       big: true,
+       wide: true,
+       outline: true,
+       class: 'usa-button',
+     ).with_content(t('links.exit_login', app_name: APP_NAME)) %>
+  <% c.troubleshooting_options do |tc| %>
+    <% tc.header { t('components.troubleshooting_options.default_heading') } %>
+    <% tc.option(
+         url: StatusPage.base_url,
+         new_tab: true,
+       ).with_content(t('vendor_outage.get_updates_on_status_page')) %>
+    <% if decorated_session.sp_name %>
+      <% tc.option(
+           url: current_sp.return_to_sp_url,
+           new_tab: true,
+         ).with_content(
+           t('idv.troubleshooting.options.get_help_at_sp', sp_name: decorated_session.sp_name),
+         ) %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/idv/gpo_verify/index.html.erb b/app/views/idv/gpo_verify/index.html.erb
index 3b57f850770..e9921d693a0 100644
--- a/app/views/idv/gpo_verify/index.html.erb
+++ b/app/views/idv/gpo_verify/index.html.erb
@@ -41,7 +41,7 @@
   </div>
 <% end %>
 
-<% if FeatureManagement.enable_gpo_verification? && !@mail_spammed %>
+<% if FeatureManagement.gpo_verification_enabled? && !@mail_spammed %>
   <%= link_to t('idv.messages.gpo.resend'), idv_gpo_path, class: 'display-block margin-bottom-2' %>
 <% end %>
 
diff --git a/app/views/idv/phone/new.html.erb b/app/views/idv/phone/new.html.erb
index e0a34dec849..2c6e5f38dfc 100644
--- a/app/views/idv/phone/new.html.erb
+++ b/app/views/idv/phone/new.html.erb
@@ -71,8 +71,8 @@
       <%= f.radio_button(
             :otp_delivery_preference,
             :sms,
-            checked: !VendorStatus.new.vendor_outage?(:sms), # We want SMS to be default checked
-            disabled: VendorStatus.new.vendor_outage?(:sms),
+            checked: !OutageStatus.new.vendor_outage?(:sms), # We want SMS to be default checked
+            disabled: OutageStatus.new.vendor_outage?(:sms),
             class: 'usa-radio__input usa-radio__input--bordered',
           ) %>
         <%= f.label :otp_delivery_preference_sms, t('two_factor_authentication.otp_delivery_preference.sms'), class: 'usa-radio__label width-full' %>
@@ -81,7 +81,7 @@
       <%= f.radio_button(
             :otp_delivery_preference,
             :voice,
-            disabled: VendorStatus.new.vendor_outage?(:voice),
+            disabled: OutageStatus.new.vendor_outage?(:voice),
             class: 'usa-radio__input usa-radio__input--bordered',
           ) %>
       <%= f.label :otp_delivery_preference_voice, t('two_factor_authentication.otp_delivery_preference.voice'), class: 'usa-radio__label width-full' %>
diff --git a/app/views/users/shared/_otp_delivery_preference_selection.html.erb b/app/views/users/shared/_otp_delivery_preference_selection.html.erb
index cc3bb484104..3727d029215 100644
--- a/app/views/users/shared/_otp_delivery_preference_selection.html.erb
+++ b/app/views/users/shared/_otp_delivery_preference_selection.html.erb
@@ -14,7 +14,7 @@
               form_name_label,
               :sms,
               form_obj.delivery_preference_sms?,
-              disabled: VendorStatus.new.vendor_outage?(:sms),
+              disabled: OutageStatus.new.vendor_outage?(:sms),
               class: 'js-otp-delivery-preference usa-radio__input usa-radio__input--bordered',
             ) %>
         <label class="usa-radio__label width-full" for="<%= form_name_tag_sms %>">
@@ -26,7 +26,7 @@
               form_name_label,
               :voice,
               form_obj.delivery_preference_voice?,
-              disabled: VendorStatus.new.vendor_outage?(:voice),
+              disabled: OutageStatus.new.vendor_outage?(:voice),
               class: 'js-otp-delivery-preference usa-radio__input usa-radio__input--bordered',
             ) %>
         <label class="usa-radio__label width-full" for="<%= form_name_tag_voice %>">
diff --git a/config/application.yml.default b/config/application.yml.default
index f7c4873d6da..a66c14792a0 100644
--- a/config/application.yml.default
+++ b/config/application.yml.default
@@ -109,6 +109,8 @@ enable_usps_verification: true
 encrypted_document_storage_enabled: true
 encrypted_document_storage_s3_bucket: 'test-bucket-changeme'
 event_disavowal_expiration_hours: 240
+feature_idv_force_gpo_verification_enabled: false
+feature_idv_hybrid_flow_enabled: true
 geo_data_file_path: 'geo_data/GeoLite2-City.mmdb'
 good_job_max_threads: 5
 good_job_queues: 'default:5;low:1;*'
diff --git a/config/locales/links/en.yml b/config/locales/links/en.yml
index eaeccd17504..5627e72f7e3 100644
--- a/config/locales/links/en.yml
+++ b/config/locales/links/en.yml
@@ -12,6 +12,7 @@ en:
     contact_support: Contact %{app_name} Support
     continue_sign_in: Continue sign in
     create_account: Create an account
+    exit_login: Exit %{app_name}
     go_back: Go back
     help: Help
     new_window: '(opens new window)'
diff --git a/config/locales/links/es.yml b/config/locales/links/es.yml
index 8017d25041e..395b5d7634d 100644
--- a/config/locales/links/es.yml
+++ b/config/locales/links/es.yml
@@ -12,6 +12,7 @@ es:
     contact_support: Póngase en contacto con el soporte técnico de %{app_name}
     continue_sign_in: Continuar el inicio de sesión
     create_account: Crear cuenta
+    exit_login: Salga de %{app_name}
     go_back: Regresa
     help: Ayuda
     new_window: '(abre nueva ventana)'
diff --git a/config/locales/links/fr.yml b/config/locales/links/fr.yml
index 7d53d7b4165..87ebf5624d4 100644
--- a/config/locales/links/fr.yml
+++ b/config/locales/links/fr.yml
@@ -12,6 +12,7 @@ fr:
     contact_support: Contactez %{app_name} le support
     continue_sign_in: Continuer la connexion
     create_account: Créer un compte
+    exit_login: Quitter %{app_name}
     go_back: Retourner
     help: Aide
     new_window: '(ouvre une nouvelle fenêtre)'
diff --git a/config/locales/vendor_outage/en.yml b/config/locales/vendor_outage/en.yml
index 4fa7ff9debc..a7d9e25cdfb 100644
--- a/config/locales/vendor_outage/en.yml
+++ b/config/locales/vendor_outage/en.yml
@@ -7,6 +7,20 @@ en:
           method if you have one, or try again later.
         idv: We cannot verify phones at this time. Please try again later or verify your
           address by mail instead.
+      pinpoint:
+        idv:
+          header: We can only verify your identity by mail right now
+          message_html: Unfortunately, %{app_name} is having technical difficulties. We’re
+            working to resolve an error so that we can verify your identity for
+            <strong>%{sp_name}</strong> quickly.
+          options_html:
+            - <a href="%{status_page_url}" class="usa-link usa-link--external"
+              target="_blank">Get updates on our status page</a> to learn when
+              the error is resolved
+            - Continue now and verify by mail, which takes <strong>3 to 7
+              business days</strong>
+            - Exit Login.gov and try again later
+          options_prompt: 'You can:'
       sms:
         default: We cannot send text messages (SMS) at this time. You can get a code by
           phone call, or choose another authentication method if you have one.
diff --git a/config/locales/vendor_outage/es.yml b/config/locales/vendor_outage/es.yml
index 094859a4cd5..5533007f109 100644
--- a/config/locales/vendor_outage/es.yml
+++ b/config/locales/vendor_outage/es.yml
@@ -9,6 +9,20 @@ es:
         idv: No podemos verificar teléfonos en estos momentos. Por favor, inténtelo
           nuevamente más tarde o, en lugar de ello, verifique su dirección por
           correo.
+      pinpoint:
+        idv:
+          header: Solo podemos verificar su identidad por correo en este momento
+          message_html: Desafortunadamente, %{app_name} está teniendo dificultades
+            técnicas. Estamos trabajando para resolver un error y poder
+            verificar su identidad en <strong>%{sp_name}</strong> rápidamente.
+          options_html:
+            - <a href="%{status_page_url}" class="usa-link usa-link--external"
+              target="_blank">Reciba actualizaciones en nuestra página de
+              estado</a> para saber cuándo se ha resuelto el error
+            - Continuar ahora y verificar por correo, que tarda de <strong>3 a 7
+              días laborables</strong>
+            - Salga de Login.gov e inténtelo de nuevo más tarde
+          options_prompt: 'Usted puede:'
       sms:
         default: No podemos enviar mensajes de texto (SMS) en estos momentos. Puede
           recibir un código por medio de una llamada telefónica o elegir otro
diff --git a/config/locales/vendor_outage/fr.yml b/config/locales/vendor_outage/fr.yml
index 83b80e5cd91..7c820ef82fd 100644
--- a/config/locales/vendor_outage/fr.yml
+++ b/config/locales/vendor_outage/fr.yml
@@ -8,6 +8,20 @@ fr:
           réessayez plus tard.
         idv: Nous ne pouvons pas vérifier les téléphones pour le moment. Veuillez
           réessayer plus tard ou vérifier votre adresse par la poste.
+      pinpoint:
+        idv:
+          header: Pour le moment, nous ne pouvons vérifier votre identité que par courrier
+          message_html: Malheureusement, %{app_name} rencontre des difficultés techniques.
+            Nous travaillons à la résolution d’une erreur afin de pouvoir
+            vérifier rapidement votre identité pour <strong>%{sp_name}</strong>.
+          options_html:
+            - <a href="%{status_page_url}" class="usa-link usa-link--external"
+              target="_blank">Obtenez des mises à jour sur notre page de
+              statut</a> pour savoir quand l’erreur est résolue.
+            - Continuer maintenant et effectuer la vérification par courrier, ce
+              qui prend de <strong>3 à 7 jours ouvrables</strong>.
+            - Quitter Login.gov
+          options_prompt: 'Vous pouvez :'
       sms:
         default: Nous ne pouvons pas envoyer de messages texte (SMS) pour le moment.
           Vous pouvez obtenir un code par appel téléphonique ou choisir une
diff --git a/config/routes.rb b/config/routes.rb
index 22d549d501a..0288c8aba3f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -302,6 +302,7 @@
       get '/activated' => 'idv#activated'
     end
     scope '/verify', module: 'idv', as: 'idv' do
+      get '/mail_only_warning' => 'gpo_only_warning#show'
       get '/come_back_later' => 'come_back_later#show'
       get '/personal_key' => 'personal_key#show'
       post '/personal_key' => 'personal_key#update'
@@ -372,7 +373,7 @@
 
     get '/account/verify' => 'idv/gpo_verify#index', as: :idv_gpo_verify
     post '/account/verify' => 'idv/gpo_verify#create'
-    if FeatureManagement.enable_gpo_verification?
+    if FeatureManagement.gpo_verification_enabled?
       scope '/verify', module: 'idv', as: 'idv' do
         get '/usps' => 'gpo#index', as: :gpo
         put '/usps' => 'gpo#create'
diff --git a/config/service_providers.localdev.yml b/config/service_providers.localdev.yml
index 0387078d9ec..d4fe52a6181 100644
--- a/config/service_providers.localdev.yml
+++ b/config/service_providers.localdev.yml
@@ -213,6 +213,7 @@ test:
     certs:
       - 'saml_test_sp'
     friendly_name: 'Test SP'
+    return_to_sp_url: 'https://example.com/'
     assertion_consumer_logout_service_url: ''
     ial: 2
     allow_prompt_login: true
diff --git a/lib/feature_management.rb b/lib/feature_management.rb
index 7763cc92c32..edf08866ea5 100644
--- a/lib/feature_management.rb
+++ b/lib/feature_management.rb
@@ -52,7 +52,7 @@ def self.use_dashboard_service_providers?
     IdentityConfig.store.use_dashboard_service_providers
   end
 
-  def self.enable_gpo_verification?
+  def self.gpo_verification_enabled?
     # leaving the usps name for backwards compatibility
     IdentityConfig.store.enable_usps_verification
   end
@@ -149,4 +149,16 @@ def self.proofing_device_profiling_decisioning_enabled?
       raise 'Invalid value for proofing_device_profiling'
     end
   end
+
+  # Whether or not idv hybrid mode is available
+  def self.idv_allow_hybrid_flow?
+    return false unless IdentityConfig.store.feature_idv_hybrid_flow_enabled
+    return false if OutageStatus.new.any_phone_vendor_outage?
+    true
+  end
+
+  def self.idv_gpo_only?
+    IdentityConfig.store.feature_idv_force_gpo_verification_enabled ||
+      OutageStatus.new.any_phone_vendor_outage?
+  end
 end
diff --git a/lib/identity_config.rb b/lib/identity_config.rb
index 64855830f63..6ec676c51b2 100644
--- a/lib/identity_config.rb
+++ b/lib/identity_config.rb
@@ -186,6 +186,8 @@ def self.build_store(config_map)
     config.add(:encrypted_document_storage_enabled, type: :boolean)
     config.add(:encrypted_document_storage_s3_bucket, type: :string)
     config.add(:event_disavowal_expiration_hours, type: :integer)
+    config.add(:feature_idv_force_gpo_verification_enabled, type: :boolean)
+    config.add(:feature_idv_hybrid_flow_enabled, type: :boolean)
     config.add(:geo_data_file_path, type: :string)
     config.add(:good_job_max_threads, type: :integer)
     config.add(:good_job_queues, type: :string)
diff --git a/spec/components/vendor_outage_alert_component_spec.rb b/spec/components/vendor_outage_alert_component_spec.rb
index 46e83ce0d5d..5be10a54d2d 100644
--- a/spec/components/vendor_outage_alert_component_spec.rb
+++ b/spec/components/vendor_outage_alert_component_spec.rb
@@ -15,7 +15,7 @@
 
   context 'with no outage' do
     before do
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).and_return(false)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).and_return(false)
     end
 
     it 'renders nothing' do
@@ -25,8 +25,8 @@
 
   context 'with outage' do
     before do
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:voice).and_return(false)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:voice).and_return(false)
     end
 
     it 'renders error alert with status page url' do
@@ -55,7 +55,7 @@
       let(:all_outage) { false }
 
       before do
-        allow_any_instance_of(VendorStatus).to receive(:all_vendor_outage?).and_return(all_outage)
+        allow_any_instance_of(OutageStatus).to receive(:all_vendor_outage?).and_return(all_outage)
       end
 
       it 'renders nothing' do
diff --git a/spec/controllers/idv/phone_controller_spec.rb b/spec/controllers/idv/phone_controller_spec.rb
index e83f5c4d09c..08ba93e9b2b 100644
--- a/spec/controllers/idv/phone_controller_spec.rb
+++ b/spec/controllers/idv/phone_controller_spec.rb
@@ -325,7 +325,7 @@
 
         context 'with full vendor outage' do
           before do
-            allow_any_instance_of(VendorStatus).to receive(:all_phone_vendor_outage?).
+            allow_any_instance_of(OutageStatus).to receive(:all_phone_vendor_outage?).
               and_return(true)
           end
 
@@ -367,7 +367,7 @@
 
         context 'with full vendor outage' do
           before do
-            allow_any_instance_of(VendorStatus).to receive(:all_phone_vendor_outage?).
+            allow_any_instance_of(OutageStatus).to receive(:all_phone_vendor_outage?).
               and_return(true)
           end
 
diff --git a/spec/controllers/users/phones_controller_spec.rb b/spec/controllers/users/phones_controller_spec.rb
index ed817cf245b..9413c5a6d4f 100644
--- a/spec/controllers/users/phones_controller_spec.rb
+++ b/spec/controllers/users/phones_controller_spec.rb
@@ -58,7 +58,7 @@
 
   context 'phone vendor outage' do
     before do
-      allow_any_instance_of(VendorStatus).to receive(:all_phone_vendor_outage?).and_return(true)
+      allow_any_instance_of(OutageStatus).to receive(:all_phone_vendor_outage?).and_return(true)
     end
 
     it 'redirects to outage page' do
diff --git a/spec/controllers/users/two_factor_authentication_controller_spec.rb b/spec/controllers/users/two_factor_authentication_controller_spec.rb
index 2ccb824cab4..3a8d3b72ad4 100644
--- a/spec/controllers/users/two_factor_authentication_controller_spec.rb
+++ b/spec/controllers/users/two_factor_authentication_controller_spec.rb
@@ -219,7 +219,7 @@ def index
 
       context 'when no options are enabled and available for use' do
         before do
-          allow_any_instance_of(VendorStatus).to receive(:any_phone_vendor_outage?).and_return(true)
+          allow_any_instance_of(OutageStatus).to receive(:any_phone_vendor_outage?).and_return(true)
         end
 
         it 'redirects to mfa options page' do
@@ -243,7 +243,7 @@ def index
 
     context 'when phone is sole configured mfa and full phone vendor outage' do
       before do
-        allow_any_instance_of(VendorStatus).to receive(:all_phone_vendor_outage?).and_return(true)
+        allow_any_instance_of(OutageStatus).to receive(:all_phone_vendor_outage?).and_return(true)
       end
 
       it 'redirects to vendor outage page' do
diff --git a/spec/controllers/vendor_outage_controller_spec.rb b/spec/controllers/vendor_outage_controller_spec.rb
index 440ad9c2461..96f05a342dc 100644
--- a/spec/controllers/vendor_outage_controller_spec.rb
+++ b/spec/controllers/vendor_outage_controller_spec.rb
@@ -6,7 +6,7 @@
   end
 
   it 'tracks an analytics event' do
-    expect_any_instance_of(VendorStatus).to receive(:track_event).with(@analytics)
+    expect_any_instance_of(OutageStatus).to receive(:track_event).with(@analytics)
 
     get :show
   end
diff --git a/spec/features/idv/doc_auth/verify_info_step_spec.rb b/spec/features/idv/doc_auth/verify_info_step_spec.rb
index b344d7b5268..062b016a739 100644
--- a/spec/features/idv/doc_auth/verify_info_step_spec.rb
+++ b/spec/features/idv/doc_auth/verify_info_step_spec.rb
@@ -390,4 +390,45 @@
       expect(page).to have_current_path(idv_phone_path)
     end
   end
+
+  context 'phone vendor outage' do
+    let(:fake_analytics) { FakeAnalytics.new }
+    let(:fake_attempts_tracker) { IrsAttemptsApiTrackingHelper::FakeAttemptsTracker.new }
+
+    # values from Idp::Constants::MOCK_IDV_APPLICANT
+    let(:fake_pii_details) do
+      {
+        document_state: 'MT',
+        document_number: '1111111111111',
+        document_issued: '2019-12-31',
+        document_expiration: '2099-12-31',
+        first_name: 'FAKEY',
+        last_name: 'MCFAKERSON',
+        date_of_birth: '1938-10-06',
+        address: '1 FAKE RD',
+      }
+    end
+
+    before do
+      allow_any_instance_of(ApplicationController).to receive(:analytics).and_return(fake_analytics)
+      allow_any_instance_of(ApplicationController).to receive(:irs_attempts_api_tracker).
+        and_return(fake_attempts_tracker)
+      allow_any_instance_of(OutageStatus).to receive(:any_phone_vendor_outage?).and_return(true)
+      visit_idp_from_sp_with_ial2(:oidc)
+      sign_in_and_2fa_user
+      complete_doc_auth_steps_before_verify_step
+    end
+
+    it 'should be at the verify step page' do
+      expect(page).to have_current_path(idv_verify_info_path)
+    end
+
+    it 'redirects to the gpo page when continuing from verify info page' do
+      click_idv_continue
+      expect(page).to have_current_path(idv_gpo_path)
+
+      click_on 'Cancel'
+      expect(page).to have_current_path(idv_cancel_path(step: :gpo))
+    end
+  end
 end
diff --git a/spec/features/idv/gpo_disabled_spec.rb b/spec/features/idv/gpo_disabled_spec.rb
index 7ce216dfdcd..4e5d378c953 100644
--- a/spec/features/idv/gpo_disabled_spec.rb
+++ b/spec/features/idv/gpo_disabled_spec.rb
@@ -5,7 +5,7 @@
 
   context 'with GPO address verification disabled' do
     before do
-      allow(FeatureManagement).to receive(:enable_gpo_verification?).and_return(false)
+      allow(FeatureManagement).to receive(:gpo_verification_enabled?).and_return(false)
       # Whether GPO is available affects the routes that are available
       # We want path helpers for unavailable routes to raise and fail the tests
       # so we reload the routes here
@@ -13,7 +13,7 @@
     end
 
     after do
-      allow(FeatureManagement).to receive(:enable_gpo_verification?).and_call_original
+      allow(FeatureManagement).to receive(:gpo_verification_enabled?).and_call_original
       Rails.application.reload_routes!
     end
 
diff --git a/spec/features/idv/outage_spec.rb b/spec/features/idv/outage_spec.rb
new file mode 100644
index 00000000000..41a74c81ae3
--- /dev/null
+++ b/spec/features/idv/outage_spec.rb
@@ -0,0 +1,213 @@
+require 'rails_helper'
+
+def sign_in_with_idv_required(user:, sms_or_totp: :sms)
+  visit_idp_from_sp_with_ial2(:oidc)
+  sign_in_user(user)
+  case sms_or_totp
+  when :sms
+    fill_in_code_with_last_phone_otp
+  when :totp
+    fill_in_code_with_last_totp(user)
+  end
+  click_submit_default
+end
+
+feature 'IdV Outage Spec' do
+  include PersonalKeyHelper
+  include IdvStepHelper
+
+  let(:user) { create(:user, :signed_up) }
+  let(:new_password) { 'some really awesome new password' }
+  let(:pii) { { ssn: '666-66-1234', dob: '1920-01-01', first_name: 'alice' } }
+
+  context 'GPO only enabled, but user starts over', js: true do
+    before do
+      allow(IdentityConfig.store).to receive(:feature_idv_force_gpo_verification_enabled).
+        and_return(true)
+    end
+
+    it 'shows mail only warning page before idv welcome page' do
+      sign_in_with_idv_required(user: user)
+
+      expect(current_path).to eq idv_mail_only_warning_path
+
+      complete_doc_auth_steps_before_document_capture_step
+      click_on t('links.cancel')
+      click_on t('idv.cancel.actions.start_over')
+
+      expect(current_path).to eq idv_mail_only_warning_path
+    end
+  end
+
+  context 'force GPO only without phone outages', js: true do
+    before do
+      allow(IdentityConfig.store).to receive(:feature_idv_force_gpo_verification_enabled).
+        and_return(true)
+      allow(IdentityConfig.store).to receive(:vendor_status_sms).
+        and_return(:operational)
+      allow(IdentityConfig.store).to receive(:vendor_status_voice).
+        and_return(:operational)
+    end
+
+    it 'shows mail only warning page before idv welcome page' do
+      sign_in_with_idv_required(user: user)
+
+      expect(current_path).to eq idv_mail_only_warning_path
+
+      click_idv_continue
+
+      expect(current_path).to eq idv_doc_auth_step_path(step: :welcome)
+    end
+  end
+
+  context 'force GPO only, but GPO not enabled', js: true do
+    before do
+      allow(IdentityConfig.store).to receive(:feature_idv_force_gpo_verification_enabled).
+        and_return(true)
+      allow(IdentityConfig.store).to receive(:enable_usps_verification).
+        and_return(false)
+    end
+
+    it 'shows mail only warning page before idv welcome page' do
+      sign_in_with_idv_required(user: user)
+
+      expect(current_path).to eq vendor_outage_path
+    end
+  end
+
+  context 'phone outage', js: true do
+    let(:user) { user_with_totp_2fa }
+
+    %i[vendor_status_sms vendor_status_voice].each do |flag|
+      context "#{flag} set to full_outage" do
+        before do
+          allow(IdentityConfig.store).to receive(flag).
+            and_return(:full_outage)
+        end
+
+        it 'shows mail only warning page before idv welcome page' do
+          sign_in_with_idv_required(user: user, sms_or_totp: :totp)
+
+          expect(current_path).to eq idv_mail_only_warning_path
+
+          click_idv_continue
+
+          expect(current_path).to eq idv_doc_auth_step_path(step: :welcome)
+        end
+
+        it 'returns to the correct page when clicking to exit', js: true do
+          sign_in_with_idv_required(user: user, sms_or_totp: :totp)
+
+          click_on t('links.exit_login', app_name: APP_NAME)
+
+          expect(current_url).to eq 'https://example.com/'
+        end
+
+        it 'skips the hybrid handoff screen and proceeds to doc capture' do
+          sign_in_with_idv_required(user: user, sms_or_totp: :totp)
+          click_idv_continue
+          click_idv_continue
+          complete_agreement_step
+
+          expect(current_path).to eq idv_doc_auth_step_path(step: :document_capture)
+        end
+      end
+    end
+  end
+
+  context 'feature_idv_force_gpo_verification_enabled set to true', js: true do
+    let(:user) { user_with_2fa }
+
+    before do
+      allow(IdentityConfig.store).to receive(:feature_idv_force_gpo_verification_enabled).
+        and_return(true)
+    end
+
+    it 'shows mail only warning page before idv welcome page', js: true do
+      sign_in_with_idv_required(user: user, sms_or_totp: :sms)
+
+      expect(current_path).to eq idv_mail_only_warning_path
+
+      click_idv_continue
+
+      expect(current_path).to eq idv_doc_auth_step_path(step: :welcome)
+    end
+
+    it 'still allows the hybrid handoff screen' do
+      sign_in_with_idv_required(user: user, sms_or_totp: :sms)
+      click_idv_continue
+      click_idv_continue
+      complete_agreement_step
+
+      expect(current_path).to eq idv_doc_auth_step_path(step: :upload)
+    end
+  end
+
+  context 'feature_idv_hybrid_flow_enabled set to false', js: true do
+    let(:user) { user_with_2fa }
+
+    before do
+      allow(IdentityConfig.store).to receive(:feature_idv_hybrid_flow_enabled).
+        and_return(false)
+    end
+
+    it 'does not show the mail only warning page before idv welcome page' do
+      sign_in_with_idv_required(user: user, sms_or_totp: :sms)
+
+      expect(current_path).to eq idv_doc_auth_step_path(step: :welcome)
+    end
+
+    it 'does not show the hybrid handoff screen' do
+      sign_in_with_idv_required(user: user, sms_or_totp: :sms)
+      click_idv_continue
+      click_idv_continue
+      complete_agreement_step
+
+      expect(current_path).to eq idv_doc_auth_step_path(step: :document_capture)
+    end
+  end
+
+  %w[acuant lexisnexis_instant_verify lexisnexis_trueid].each do |service|
+    context "vendor_status_#{service} set to full_outage" do
+      let(:user) { user_with_2fa }
+      before do
+        allow(IdentityConfig.store).to receive("vendor_status_#{service}".to_sym).
+          and_return(:full_outage)
+      end
+
+      it 'prevents an existing ial1 user from verifying their identity' do
+        sign_in_with_idv_required(user: user, sms_or_totp: :sms)
+        expect(current_path).to eq vendor_outage_path
+        expect(page).to have_content(
+          t('vendor_outage.blocked.idv.with_sp', service_provider: 'Test SP'),
+        )
+      end
+
+      it 'prevents a user who reset their password from reactivating profile with no personal key',
+         email: true, js: true do
+        personal_key_from_pii(user, pii)
+        trigger_reset_password_and_click_email_link(user.email)
+        reset_password(user, new_password)
+
+        visit new_user_session_path
+        signin(user.email, new_password)
+        fill_in_code_with_last_phone_otp
+        click_submit_default
+
+        click_link t('account.index.reactivation.link')
+        click_on t('links.account.reactivate.without_key')
+        click_on t('forms.buttons.continue')
+
+        expect(current_path).to eq vendor_outage_path
+        expect(page).to have_content(t('vendor_outage.blocked.idv.without_sp'))
+      end
+
+      it 'prevents a user from creating an account' do
+        visit_idp_from_sp_with_ial2(:oidc)
+        click_link t('links.create_account')
+        expect(current_path).to eq vendor_outage_path
+        expect(page).to have_content(t('vendor_outage.blocked.idv.generic'))
+      end
+    end
+  end
+end
diff --git a/spec/features/idv/steps/gpo_otp_verification_step_spec.rb b/spec/features/idv/steps/gpo_otp_verification_step_spec.rb
index 13b96d0e147..b2faeddac66 100644
--- a/spec/features/idv/steps/gpo_otp_verification_step_spec.rb
+++ b/spec/features/idv/steps/gpo_otp_verification_step_spec.rb
@@ -96,7 +96,7 @@
 
   context 'with gpo feature disabled' do
     before do
-      allow(IdentityConfig.store).to receive(:enable_gpo_verification?).and_return(true)
+      allow(IdentityConfig.store).to receive(:gpo_verification_enabled?).and_return(true)
     end
 
     it 'allows a user to verify their account for an existing pending profile' do
diff --git a/spec/features/idv/steps/phone_step_spec.rb b/spec/features/idv/steps/phone_step_spec.rb
index 4e43ad7791e..9b5a40d73e3 100644
--- a/spec/features/idv/steps/phone_step_spec.rb
+++ b/spec/features/idv/steps/phone_step_spec.rb
@@ -157,7 +157,7 @@
     end
 
     it 'does not render the link to proof by mail if proofing by mail is disabled' do
-      allow(FeatureManagement).to receive(:enable_gpo_verification?).and_return(false)
+      allow(FeatureManagement).to receive(:gpo_verification_enabled?).and_return(false)
 
       start_idv_from_sp
       complete_idv_steps_before_phone_step
diff --git a/spec/features/idv/vendor_outage_spec.rb b/spec/features/idv/vendor_outage_spec.rb
deleted file mode 100644
index 853fc247011..00000000000
--- a/spec/features/idv/vendor_outage_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'rails_helper'
-
-feature 'vendor_outage_spec' do
-  include PersonalKeyHelper
-  include IdvStepHelper
-
-  let(:user) { create(:user, :signed_up) }
-  let(:new_password) { 'some really awesome new password' }
-  let(:pii) { { ssn: '666-66-1234', dob: '1920-01-01', first_name: 'alice' } }
-
-  %w[acuant lexisnexis_instant_verify lexisnexis_trueid].each do |service|
-    context "full outage on #{service}" do
-      before do
-        allow(IdentityConfig.store).to receive("vendor_status_#{service}".to_sym).
-          and_return(:full_outage)
-      end
-
-      it 'prevents an existing ial1 user from verifying their identity' do
-        visit_idp_from_sp_with_ial2(:oidc)
-        sign_in_user(user_with_2fa)
-        fill_in_code_with_last_phone_otp
-        click_submit_default
-        expect(current_path).to eq vendor_outage_path
-        expect(page).to have_content(
-          t('vendor_outage.blocked.idv.with_sp', service_provider: 'Test SP'),
-        )
-      end
-
-      it 'prevents a user who reset their password from reactivating profile with no personal key',
-         email: true, js: true do
-        personal_key_from_pii(user, pii)
-        trigger_reset_password_and_click_email_link(user.email)
-        reset_password(user, new_password)
-
-        visit new_user_session_path
-        signin(user.email, new_password)
-        fill_in_code_with_last_phone_otp
-        click_submit_default
-
-        click_link t('account.index.reactivation.link')
-        click_on t('links.account.reactivate.without_key')
-        click_on t('forms.buttons.continue')
-
-        expect(current_path).to eq vendor_outage_path
-        expect(page).to have_content(t('vendor_outage.blocked.idv.without_sp'))
-      end
-
-      it 'prevents a user from creating an account' do
-        visit_idp_from_sp_with_ial2(:oidc)
-        click_link t('links.create_account')
-        expect(current_path).to eq vendor_outage_path
-        expect(page).to have_content(t('vendor_outage.blocked.idv.generic'))
-      end
-    end
-  end
-end
diff --git a/spec/forms/new_phone_form_spec.rb b/spec/forms/new_phone_form_spec.rb
index e28206d9487..c3a50db4ad3 100644
--- a/spec/forms/new_phone_form_spec.rb
+++ b/spec/forms/new_phone_form_spec.rb
@@ -476,7 +476,7 @@
 
     context 'sms outage' do
       before do
-        allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
+        allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
       end
 
       it 'is false' do
@@ -492,7 +492,7 @@
 
     context 'sms outage' do
       before do
-        allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
+        allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
       end
 
       it 'is true' do
diff --git a/spec/presenters/two_factor_authentication/phone_selection_presenter_spec.rb b/spec/presenters/two_factor_authentication/phone_selection_presenter_spec.rb
index de4e6b64c4b..b22167d42f3 100644
--- a/spec/presenters/two_factor_authentication/phone_selection_presenter_spec.rb
+++ b/spec/presenters/two_factor_authentication/phone_selection_presenter_spec.rb
@@ -34,7 +34,7 @@
 
     context 'all phone vendor outage' do
       before do
-        allow_any_instance_of(VendorStatus).to receive(:all_phone_vendor_outage?).and_return(true)
+        allow_any_instance_of(OutageStatus).to receive(:all_phone_vendor_outage?).and_return(true)
       end
 
       it { expect(presenter_without_mfa.disabled?).to eq(true) }
diff --git a/spec/presenters/two_factor_authentication/sms_selection_presenter_spec.rb b/spec/presenters/two_factor_authentication/sms_selection_presenter_spec.rb
index d29b9cb0706..4a9e3ff8b23 100644
--- a/spec/presenters/two_factor_authentication/sms_selection_presenter_spec.rb
+++ b/spec/presenters/two_factor_authentication/sms_selection_presenter_spec.rb
@@ -44,7 +44,7 @@
 
     context 'sms vendor outage' do
       before do
-        allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
+        allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
       end
 
       it { expect(subject.disabled?).to eq(true) }
diff --git a/spec/presenters/two_factor_authentication/voice_selection_presenter_spec.rb b/spec/presenters/two_factor_authentication/voice_selection_presenter_spec.rb
index 27808a115a9..8d6b715585b 100644
--- a/spec/presenters/two_factor_authentication/voice_selection_presenter_spec.rb
+++ b/spec/presenters/two_factor_authentication/voice_selection_presenter_spec.rb
@@ -44,7 +44,7 @@
 
     context 'voice vendor outage' do
       before do
-        allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:voice).
+        allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:voice).
           and_return(true)
       end
 
diff --git a/spec/presenters/two_factor_login_options_presenter_spec.rb b/spec/presenters/two_factor_login_options_presenter_spec.rb
index 0414170a3f0..2aa6cc721de 100644
--- a/spec/presenters/two_factor_login_options_presenter_spec.rb
+++ b/spec/presenters/two_factor_login_options_presenter_spec.rb
@@ -112,8 +112,8 @@
     context 'disabled options' do
       before do
         create(:phone_configuration, user: user, phone: '(202) 555-1111')
-        allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).and_return(false)
-        allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
+        allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).and_return(false)
+        allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
       end
 
       it 'returns first enabled index' do
diff --git a/spec/routing/gpo_verification_routing_spec.rb b/spec/routing/gpo_verification_routing_spec.rb
index 40ba27c33ea..c01bb18bca9 100644
--- a/spec/routing/gpo_verification_routing_spec.rb
+++ b/spec/routing/gpo_verification_routing_spec.rb
@@ -14,7 +14,7 @@
   ].freeze
 
   before do
-    allow(FeatureManagement).to receive(:enable_gpo_verification?).
+    allow(FeatureManagement).to receive(:gpo_verification_enabled?).
       and_return(enable_gpo_verification)
     Rails.application.reload_routes!
   end
diff --git a/spec/services/vendor_status_spec.rb b/spec/services/outage_status_spec.rb
similarity index 87%
rename from spec/services/vendor_status_spec.rb
rename to spec/services/outage_status_spec.rb
index bd59e003aff..8c1f234bda0 100644
--- a/spec/services/vendor_status_spec.rb
+++ b/spec/services/outage_status_spec.rb
@@ -1,11 +1,11 @@
 require 'rails_helper'
 
-describe VendorStatus do
+describe OutageStatus do
   let(:from) { nil }
   let(:from_idv) { nil }
   let(:sp) { nil }
   subject(:vendor_status) do
-    VendorStatus.new(from: from, from_idv: from_idv, sp: sp)
+    OutageStatus.new(from: from, from_idv: from_idv, sp: sp)
   end
 
   it 'raises an error if passed an unknown vendor' do
@@ -14,7 +14,7 @@
 
   context 'when all vendors are operational' do
     before do
-      VendorStatus::ALL_VENDORS.each do |vendor|
+      OutageStatus::ALL_VENDORS.each do |vendor|
         allow(IdentityConfig.store).to receive("vendor_status_#{vendor}".to_sym).
           and_return(:operational)
       end
@@ -24,13 +24,13 @@
       expect(subject.any_vendor_outage?).not_to be
     end
 
-    it 'correctly reports no ial2 vendor outage' do
-      expect(subject.any_ial2_vendor_outage?).not_to be
+    it 'correctly reports no idv vendor outage' do
+      expect(subject.any_idv_vendor_outage?).not_to be
     end
   end
 
   context 'when any vendor has an outage' do
-    VendorStatus::ALL_VENDORS.each do |vendor|
+    OutageStatus::ALL_VENDORS.each do |vendor|
       before do
         allow(IdentityConfig.store).to receive("vendor_status_#{vendor}".to_sym).
           and_return(:full_outage)
@@ -42,14 +42,14 @@
     end
   end
 
-  context 'when an ial2 vendor has an outage' do
+  context 'when an idv vendor has an outage' do
     before do
       allow(IdentityConfig.store).to receive(:vendor_status_acuant).
         and_return(:full_outage)
     end
 
-    it 'correctly reports an ial2 vendor outage' do
-      expect(subject.any_ial2_vendor_outage?).to be
+    it 'correctly reports an idv vendor outage' do
+      expect(subject.any_idv_vendor_outage?).to be
     end
 
     context 'user coming from create_account' do
@@ -87,14 +87,14 @@
     end
   end
 
-  context 'when a non-ial2 vendor has an outage' do
+  context 'when a non-idv vendor has an outage' do
     before do
       allow(IdentityConfig.store).to receive(:vendor_status_sms).
         and_return(:full_outage)
     end
 
-    it 'correctly reports no ial2 vendor outage' do
-      expect(subject.any_ial2_vendor_outage?).not_to be
+    it 'correctly reports no idv vendor outage' do
+      expect(subject.any_idv_vendor_outage?).not_to be
     end
   end
 
@@ -163,7 +163,7 @@
     context 'phone vendor outage' do
       before do
         allow(vendor_status).to receive(:vendor_outage?).and_return(false)
-        VendorStatus::PHONE_VENDORS.each do |vendor|
+        OutageStatus::PHONE_VENDORS.each do |vendor|
           allow(vendor_status).to receive(:vendor_outage?).with(vendor).and_return(true)
         end
       end
@@ -188,7 +188,7 @@
       expect(analytics).to receive(:track_event).with(
         'Vendor Outage',
         redirect_from: from,
-        vendor_status: VendorStatus::ALL_VENDORS.index_with do |_vendor|
+        vendor_status: OutageStatus::ALL_VENDORS.index_with do |_vendor|
           satisfy { |status| IdentityConfig::VENDOR_STATUS_OPTIONS.include?(status) }
         end,
       )
diff --git a/spec/support/features/doc_auth_helper.rb b/spec/support/features/doc_auth_helper.rb
index 3bd3fa6233f..494c61a5e28 100644
--- a/spec/support/features/doc_auth_helper.rb
+++ b/spec/support/features/doc_auth_helper.rb
@@ -79,6 +79,8 @@ def idv_doc_auth_email_sent_step
 
   def complete_doc_auth_steps_before_welcome_step(expect_accessible: false)
     visit idv_doc_auth_welcome_step unless current_path == idv_doc_auth_welcome_step
+    click_idv_continue if current_path == idv_mail_only_warning_path
+
     expect(page).to be_axe_clean.according_to :section508, :"best-practice" if expect_accessible
   end
 
@@ -108,6 +110,10 @@ def complete_doc_auth_steps_before_upload_step(expect_accessible: false)
   end
 
   def complete_upload_step
+    # If there is a phone outage, the upload step is
+    # skipped and the user is taken straight to
+    # document capture.
+    return if OutageStatus.new.any_phone_vendor_outage?
     click_on t('forms.buttons.upload_photos')
   end
 
diff --git a/spec/views/idv/doc_auth/welcome.html.erb_spec.rb b/spec/views/idv/doc_auth/welcome.html.erb_spec.rb
index 3d05273ade4..41b33a6503a 100644
--- a/spec/views/idv/doc_auth/welcome.html.erb_spec.rb
+++ b/spec/views/idv/doc_auth/welcome.html.erb_spec.rb
@@ -107,7 +107,7 @@
 
   context 'phone vendor outage' do
     before do
-      allow_any_instance_of(VendorStatus).to receive(:all_vendor_outage?).and_return(true)
+      allow_any_instance_of(OutageStatus).to receive(:all_vendor_outage?).and_return(true)
     end
 
     it 'renders alert banner' do
diff --git a/spec/views/phone_setup/index.html.erb_spec.rb b/spec/views/phone_setup/index.html.erb_spec.rb
index 7e1d8bda3e3..70f9ff0d834 100644
--- a/spec/views/phone_setup/index.html.erb_spec.rb
+++ b/spec/views/phone_setup/index.html.erb_spec.rb
@@ -88,8 +88,8 @@
 
   context 'phone vendor outage' do
     before do
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).and_return(false)
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).and_return(false)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
     end
 
     it 'renders alert banner' do
diff --git a/spec/views/two_factor_authentication/options/index.html.erb_spec.rb b/spec/views/two_factor_authentication/options/index.html.erb_spec.rb
index b7dca2fdd4b..9e3eca0acca 100644
--- a/spec/views/two_factor_authentication/options/index.html.erb_spec.rb
+++ b/spec/views/two_factor_authentication/options/index.html.erb_spec.rb
@@ -41,8 +41,8 @@
   context 'phone vendor outage' do
     before do
       create(:phone_configuration, user: user, phone: '(202) 555-1111')
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).and_return(false)
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).and_return(false)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
 
       render
     end
diff --git a/spec/views/users/phones/add.html.erb_spec.rb b/spec/views/users/phones/add.html.erb_spec.rb
index 64ec39a8661..cbb31e92be2 100644
--- a/spec/views/users/phones/add.html.erb_spec.rb
+++ b/spec/views/users/phones/add.html.erb_spec.rb
@@ -12,8 +12,8 @@
 
   context 'phone vendor outage' do
     before do
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).and_return(false)
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).and_return(false)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
     end
 
     it 'renders alert banner' do
diff --git a/spec/views/users/shared/_otp_delivery_preference_selection.html.erb_spec.rb b/spec/views/users/shared/_otp_delivery_preference_selection.html.erb_spec.rb
index 0180a00c2c7..e12c102cee1 100644
--- a/spec/views/users/shared/_otp_delivery_preference_selection.html.erb_spec.rb
+++ b/spec/views/users/shared/_otp_delivery_preference_selection.html.erb_spec.rb
@@ -13,8 +13,8 @@
 
   context 'sms vendor outage' do
     before do
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).and_return(false)
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).and_return(false)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
     end
 
     it 'renders disabled sms option' do
@@ -28,8 +28,8 @@
 
   context 'voice vendor outage' do
     before do
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).and_return(false)
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:voice).and_return(true)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).and_return(false)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:voice).and_return(true)
     end
 
     it 'renders disabled voice option' do
diff --git a/spec/views/users/two_factor_authentication_setup/index.html.erb_spec.rb b/spec/views/users/two_factor_authentication_setup/index.html.erb_spec.rb
index 524f13846d6..6f6c70e3453 100644
--- a/spec/views/users/two_factor_authentication_setup/index.html.erb_spec.rb
+++ b/spec/views/users/two_factor_authentication_setup/index.html.erb_spec.rb
@@ -13,8 +13,8 @@
 
   context 'all phone vendor outage' do
     before do
-      allow_any_instance_of(VendorStatus).to receive(:all_vendor_outage?).
-        with(VendorStatus::PHONE_VENDORS).and_return(true)
+      allow_any_instance_of(OutageStatus).to receive(:all_vendor_outage?).
+        with(OutageStatus::PHONE_VENDORS).and_return(true)
     end
 
     it 'renders alert banner' do
@@ -32,8 +32,8 @@
 
   context 'single phone vendor outage' do
     before do
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).and_return(false)
-      allow_any_instance_of(VendorStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).and_return(false)
+      allow_any_instance_of(OutageStatus).to receive(:vendor_outage?).with(:sms).and_return(true)
     end
 
     it 'does not render alert banner' do