diff --git a/Makefile b/Makefile
index b47e39d78cc..f2c86cbc1e8 100644
--- a/Makefile
+++ b/Makefile
@@ -113,9 +113,15 @@ lint_yarn_lock: package.json yarn.lock
 
 lint_lockfiles: lint_gemfile_lock lint_yarn_lock ## Lints to ensure lockfiles are in sync
 
-lintfix: ## Runs rubocop fix
+lintfix: ## Try to automatically fix any ruby, ERB, javascript, or CSS lint errors
 	@echo "--- rubocop fix ---"
 	bundle exec rubocop -a
+	@echo "--- erblint fix ---"
+	bundle exec erblint app/views app/components -a
+	@echo "--- eslint fix ---"
+	yarn lint --fix
+	@echo "--- stylelint fix ---"
+	yarn lint:css --fix
 
 brakeman: ## Runs brakeman
 	bundle exec brakeman
@@ -159,8 +165,8 @@ run-https: tmp/$(HOST)-$(PORT).key tmp/$(HOST)-$(PORT).crt ## Runs the developme
 
 normalize_yaml: ## Normalizes YAML files (alphabetizes keys, fixes line length, smart quotes)
 	yarn normalize-yaml .rubocop.yml --disable-sort-keys --disable-smart-punctuation
-	find ./config/locales/telephony -type f | xargs yarn normalize-yaml --disable-smart-punctuation
-	find ./config/locales -not -path "./config/locales/telephony*" -type f | xargs yarn normalize-yaml \
+	find ./config/locales/telephony -type f -name '*.yml' | xargs yarn normalize-yaml --disable-smart-punctuation
+	find ./config/locales -not -path "./config/locales/telephony*" -type f -name '*.yml' | xargs yarn normalize-yaml \
 		config/pinpoint_supported_countries.yml \
 		config/pinpoint_overrides.yml \
 		config/country_dialing_codes.yml
diff --git a/app/controllers/api/irs_attempts_api_controller.rb b/app/controllers/api/irs_attempts_api_controller.rb
index 138d7768efc..e6719e600bf 100644
--- a/app/controllers/api/irs_attempts_api_controller.rb
+++ b/app/controllers/api/irs_attempts_api_controller.rb
@@ -20,7 +20,7 @@ class IrsAttemptsApiController < ApplicationController
     def create
       start_time = Time.zone.now.to_f
       if timestamp
-        if IdentityConfig.store.irs_attempt_api_aws_s3_enabled
+        if s3_helper.attempts_serve_events_from_s3
           if IrsAttemptApiLogFile.find_by(requested_time: timestamp_key(key: timestamp))
             log_file_record = IrsAttemptApiLogFile.find_by(
               requested_time: timestamp_key(key: timestamp),
@@ -29,10 +29,8 @@ def create
             headers['X-Payload-Key'] = log_file_record.encrypted_key
             headers['X-Payload-IV'] = log_file_record.iv
 
-            bucket_name = IdentityConfig.store.irs_attempt_api_bucket_name
-
-            requested_data = s3_client.get_object(
-              bucket: bucket_name,
+            requested_data = s3_helper.s3_client.get_object(
+              bucket: s3_helper.attempts_bucket_name,
               key: log_file_record.filename,
             )
 
@@ -102,8 +100,8 @@ def redis_client
       @redis_client ||= IrsAttemptsApi::RedisClient.new
     end
 
-    def s3_client
-      @s3_client ||= JobHelpers::S3Helper.new.s3_client
+    def s3_helper
+      @s3_helper ||= JobHelpers::S3Helper.new
     end
 
     def valid_auth_tokens
diff --git a/app/javascript/packages/build-sass/CHANGELOG.md b/app/javascript/packages/build-sass/CHANGELOG.md
index 3633966fa5e..86b50fbdca5 100644
--- a/app/javascript/packages/build-sass/CHANGELOG.md
+++ b/app/javascript/packages/build-sass/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Improvements
 
 - Improves watch mode error recovery to monitor changes to all files in the stack trace of the error.
+- Adds support for `--load-path=` flag to include additional default paths in Sass path resolution.
 
 ## 1.0.0 (2022-11-21)
 
diff --git a/app/javascript/packages/build-sass/README.md b/app/javascript/packages/build-sass/README.md
index 53b6bf3ccf3..5a3a7923731 100644
--- a/app/javascript/packages/build-sass/README.md
+++ b/app/javascript/packages/build-sass/README.md
@@ -22,13 +22,14 @@ Default behavior includes:
 Invoke the included `build-sass` executable with the source files and any relevant command flags.
 
 ```
-npx build-sass path/to/sass/*.css.scss --out-dir=build
+npx build-sass path/to/sass/*.css.scss --out-dir=build --load-path=node_modules/@uswds/uswds/packages
 ```
 
 Flags:
 
 - `--out-dir`: The output directory
 - `--watch`: Run in watch mode, recompiling files on change
+- `--load-path`: Include additional path in Sass path resolution
 
 ### API
 
diff --git a/app/javascript/packages/build-sass/cli.js b/app/javascript/packages/build-sass/cli.js
index 1e514b0c139..a77f6c7d67e 100755
--- a/app/javascript/packages/build-sass/cli.js
+++ b/app/javascript/packages/build-sass/cli.js
@@ -20,9 +20,12 @@ const flags = args.filter((arg) => arg.startsWith('-'));
 
 const isWatching = flags.includes('--watch');
 const outDir = flags.find((flag) => flag.startsWith('--out-dir='))?.slice(10);
+const loadPaths = flags
+  .filter((flag) => flag.startsWith('--load-path='))
+  .map((flag) => flag.slice(12));
 
 /** @type {BuildOptions & SyncSassOptions} */
-const options = { outDir, optimize: isProduction };
+const options = { outDir, loadPaths, optimize: isProduction };
 
 /**
  * Watches given file path(s), triggering the callback on the first change.
diff --git a/app/javascript/packages/build-sass/index.js b/app/javascript/packages/build-sass/index.js
index df99996fc53..cad1aae6e76 100644
--- a/app/javascript/packages/build-sass/index.js
+++ b/app/javascript/packages/build-sass/index.js
@@ -27,11 +27,11 @@ const TARGETS = browserslistToTargets(
  * @return {Promise<CompileResult>}
  */
 export async function buildFile(file, options) {
-  const { outDir, optimize, ...sassOptions } = options;
+  const { outDir, optimize, loadPaths = [], ...sassOptions } = options;
   const sassResult = sass.compile(file, {
     style: optimize ? 'compressed' : 'expanded',
     ...sassOptions,
-    loadPaths: ['node_modules'],
+    loadPaths: ['node_modules', ...loadPaths],
     quietDeps: true,
   });
 
diff --git a/app/javascript/packages/document-capture/components/in-person-location-post-office-search-step.tsx b/app/javascript/packages/document-capture/components/in-person-location-post-office-search-step.tsx
index 8350cef79e2..bddb9cc5626 100644
--- a/app/javascript/packages/document-capture/components/in-person-location-post-office-search-step.tsx
+++ b/app/javascript/packages/document-capture/components/in-person-location-post-office-search-step.tsx
@@ -11,11 +11,13 @@ import InPersonLocations, { FormattedLocation } from './in-person-locations';
 interface PostOffice {
   address: string;
   city: string;
+  distance: string;
   name: string;
   phone: string;
   saturday_hours: string;
   state: string;
   sunday_hours: string;
+  tty: string;
   weekday_hours: string;
   zip_code_4: string;
   zip_code_5: string;
@@ -37,11 +39,13 @@ const formatLocation = (postOffices: PostOffice[]) => {
     const location = {
       formattedCityStateZip: `${po.city}, ${po.state}, ${po.zip_code_5}-${po.zip_code_4}`,
       id: index,
+      distance: po.distance,
       name: po.name,
       phone: po.phone,
       saturdayHours: po.saturday_hours,
       streetAddress: po.address,
       sundayHours: po.sunday_hours,
+      tty: po.tty,
       weekdayHours: po.weekday_hours,
     } as FormattedLocation;
     formattedLocations.push(location);
diff --git a/app/javascript/packages/document-capture/components/in-person-locations.tsx b/app/javascript/packages/document-capture/components/in-person-locations.tsx
index 0c689105fb7..e0e98af4a8e 100644
--- a/app/javascript/packages/document-capture/components/in-person-locations.tsx
+++ b/app/javascript/packages/document-capture/components/in-person-locations.tsx
@@ -4,9 +4,11 @@ import LocationCollectionItem from './location-collection-item';
 
 export interface FormattedLocation {
   formattedCityStateZip: string;
+  distance: string;
   id: number;
   name: string;
   phone: string;
+  tty: string;
   saturdayHours: string;
   streetAddress: string;
   sundayHours: string;
@@ -47,10 +49,12 @@ function InPersonLocations({ locations, onSelect, address }: InPersonLocationsPr
           <LocationCollectionItem
             key={`${index}-${item.name}`}
             handleSelect={onSelect}
-            name={`${item.name} — ${t('in_person_proofing.body.location.post_office')}`}
+            distance={item.distance}
             streetAddress={item.streetAddress}
             selectId={item.id}
             formattedCityStateZip={item.formattedCityStateZip}
+            phone={item.phone}
+            tty={item.tty}
             weekdayHours={item.weekdayHours}
             saturdayHours={item.saturdayHours}
             sundayHours={item.sundayHours}
diff --git a/app/javascript/packages/document-capture/components/location-collection-item.spec.tsx b/app/javascript/packages/document-capture/components/location-collection-item.spec.tsx
index 8aa1431745d..b1d58c1d530 100644
--- a/app/javascript/packages/document-capture/components/location-collection-item.spec.tsx
+++ b/app/javascript/packages/document-capture/components/location-collection-item.spec.tsx
@@ -59,4 +59,28 @@ describe('LocationCollectionItem', () => {
       .parentElement!;
     expect(sunHours.textContent).to.contain('Closed');
   });
+
+  it('renders the component that includes contact information with expected data', () => {
+    const onClick = sinon.stub();
+    const { getByText } = render(
+      <LocationCollectionItem
+        distance="1.0 mi"
+        phone="555-123-4567"
+        tty="222-222-2222"
+        name=""
+        streetAddress="123 Test Address"
+        formattedCityStateZip=""
+        handleSelect={onClick}
+        weekdayHours=""
+        saturdayHours=""
+        selectId={0}
+        sundayHours=""
+      />,
+    );
+
+    const addressParent = getByText('123 Test Address').parentElement!;
+    expect(addressParent.textContent).to.contain('in_person_proofing.body.location.distance');
+    expect(addressParent.textContent).to.contain('555-123-4567');
+    expect(addressParent.textContent).to.contain('222-222-2222');
+  });
 });
diff --git a/app/javascript/packages/document-capture/components/location-collection-item.tsx b/app/javascript/packages/document-capture/components/location-collection-item.tsx
index dbc67e46a30..6ce95be84ca 100644
--- a/app/javascript/packages/document-capture/components/location-collection-item.tsx
+++ b/app/javascript/packages/document-capture/components/location-collection-item.tsx
@@ -2,33 +2,47 @@ import { Button } from '@18f/identity-components';
 import { useI18n } from '@18f/identity-react-i18n';
 
 interface LocationCollectionItemProps {
+  distance?: string;
   formattedCityStateZip: string;
   handleSelect: (event: React.FormEvent<HTMLInputElement>, selection: number) => void;
-  name: string;
+  name?: string;
+  phone?: string;
   saturdayHours: string;
   selectId: number;
   streetAddress: string;
   sundayHours: string;
+  tty?: string;
   weekdayHours: string;
 }
 
 function LocationCollectionItem({
+  distance,
   formattedCityStateZip,
   handleSelect,
   name,
+  phone,
   saturdayHours,
   selectId,
   streetAddress,
   sundayHours,
+  tty,
   weekdayHours,
 }: LocationCollectionItemProps) {
   const { t } = useI18n();
+  const numericDistance = distance?.split(' ')[0];
 
   return (
     <li className="location-collection-item">
       <div className="usa-collection__body">
         <div className="display-flex flex-justify">
-          <h3 className="usa-collection__heading">{name}</h3>
+          {numericDistance && (
+            <h3 className="usa-collection__heading">
+              {t('in_person_proofing.body.location.distance', {
+                count: parseFloat(numericDistance),
+              })}
+            </h3>
+          )}
+          {!distance && <h3 className="usa-collection__heading">{name}</h3>}
           <Button
             id={`location_button_desktop_${selectId}`}
             className="display-none tablet:display-inline-block"
@@ -46,6 +60,13 @@ function LocationCollectionItem({
         <div>{`${t('in_person_proofing.body.location.retail_hours_weekday')} ${weekdayHours}`}</div>
         <div>{`${t('in_person_proofing.body.location.retail_hours_sat')} ${saturdayHours}`}</div>
         <div>{`${t('in_person_proofing.body.location.retail_hours_sun')} ${sundayHours}`}</div>
+        {(phone || tty) && (
+          <div>
+            <h4>{t('in_person_proofing.body.location.contact_info_heading')}</h4>
+            <div>{`${t('in_person_proofing.body.location.phone')} ${phone}`}</div>
+            <div>{`${t('in_person_proofing.body.location.tty')} ${tty}`}</div>
+          </div>
+        )}
         <Button
           id={`location_button_mobile_${selectId}`}
           className="tablet:display-none margin-top-2 width-full"
diff --git a/app/jobs/irs_attempts_events_batch_job.rb b/app/jobs/irs_attempts_events_batch_job.rb
index d9eea81a053..00f8f5a3e77 100644
--- a/app/jobs/irs_attempts_events_batch_job.rb
+++ b/app/jobs/irs_attempts_events_batch_job.rb
@@ -2,9 +2,7 @@ class IrsAttemptsEventsBatchJob < ApplicationJob
   queue_as :default
 
   def perform(timestamp = Time.zone.now - 1.hour)
-    enabled = IdentityConfig.store.irs_attempt_api_enabled &&
-              IdentityConfig.store.irs_attempt_api_aws_s3_enabled &&
-              IdentityConfig.store.irs_attempt_api_bucket_name
+    enabled = IdentityConfig.store.irs_attempt_api_enabled && s3_helper.attempts_s3_write_enabled
     return nil unless enabled
 
     events = IrsAttemptsApi::RedisClient.new.read_events(timestamp: timestamp)
@@ -16,10 +14,8 @@ def perform(timestamp = Time.zone.now - 1.hour)
       data: event_values, timestamp: timestamp, public_key_str: public_key,
     )
 
-    bucket_name = IdentityConfig.store.irs_attempt_api_bucket_name
-
     create_and_upload_to_attempts_s3_resource(
-      bucket_name: bucket_name, filename: result.filename,
+      bucket_name: s3_helper.attempts_bucket_name, filename: result.filename,
       encrypted_data: result.encrypted_data
     )
 
@@ -42,4 +38,8 @@ def create_and_upload_to_attempts_s3_resource(bucket_name:, filename:, encrypted
   def redis_client
     @redis_client ||= IrsAttemptsApi::RedisClient.new
   end
+
+  def s3_helper
+    @s3_helper ||= JobHelpers::S3Helper.new
+  end
 end
diff --git a/app/jobs/job_helpers/s3_helper.rb b/app/jobs/job_helpers/s3_helper.rb
index 614cf435ef6..9ea95b3b18d 100644
--- a/app/jobs/job_helpers/s3_helper.rb
+++ b/app/jobs/job_helpers/s3_helper.rb
@@ -25,5 +25,17 @@ def s3_client
         compute_checksums: false,
       )
     end
+
+    def attempts_bucket_name
+      IdentityConfig.store.irs_attempt_api_bucket_name
+    end
+
+    def attempts_s3_write_enabled
+      (attempts_bucket_name && attempts_bucket_name != 'default-placeholder')
+    end
+
+    def attempts_serve_events_from_s3
+      IdentityConfig.store.irs_attempt_api_aws_s3_enabled && attempts_s3_write_enabled
+    end
   end
 end
diff --git a/app/models/profile.rb b/app/models/profile.rb
index 7af8707d628..8ae293b453d 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -24,6 +24,7 @@ class Profile < ApplicationRecord
     verification_cancelled: 4,
     in_person_verification_pending: 5,
     threatmetrix_review_pending: 6,
+    threatmetrix_review_rejected: 7,
   }
 
   attr_reader :personal_key
diff --git a/app/models/proofing_component.rb b/app/models/proofing_component.rb
index 011ca97381a..59e45dd725b 100644
--- a/app/models/proofing_component.rb
+++ b/app/models/proofing_component.rb
@@ -1,3 +1,7 @@
 class ProofingComponent < ApplicationRecord
   belongs_to :user
+
+  def review_eligible?
+    verified_at.after?(30.days.ago)
+  end
 end
diff --git a/app/presenters/two_factor_login_options_presenter.rb b/app/presenters/two_factor_login_options_presenter.rb
index c18e6ad7fc0..3b8dde9a926 100644
--- a/app/presenters/two_factor_login_options_presenter.rb
+++ b/app/presenters/two_factor_login_options_presenter.rb
@@ -84,9 +84,7 @@ def account_reset_link
   end
 
   def account_reset_url(locale:)
-    IdentityConfig.store.show_account_recovery_recovery_options ?
-      account_reset_recovery_options_path(locale: locale) :
-        account_reset_request_path(locale: locale)
+    account_reset_recovery_options_path(locale: locale)
   end
 
   def account_reset_cancel_link
diff --git a/app/services/usps_in_person_proofing/post_office.rb b/app/services/usps_in_person_proofing/post_office.rb
index 3febd3fccad..98a4d458532 100644
--- a/app/services/usps_in_person_proofing/post_office.rb
+++ b/app/services/usps_in_person_proofing/post_office.rb
@@ -8,6 +8,7 @@ module UspsInPersonProofing
     :saturday_hours,
     :state,
     :sunday_hours,
+    :tty,
     :weekday_hours,
     :zip_code_4,
     :zip_code_5,
diff --git a/app/services/usps_in_person_proofing/proofer.rb b/app/services/usps_in_person_proofing/proofer.rb
index 4210627b77e..d2f829f9db4 100644
--- a/app/services/usps_in_person_proofing/proofer.rb
+++ b/app/services/usps_in_person_proofing/proofer.rb
@@ -205,6 +205,7 @@ def parse_facilities(facilities)
           saturday_hours: hours['saturdayHours'],
           state: post_office['state'],
           sunday_hours: hours['sundayHours'],
+          tty: post_office['tty'],
           weekday_hours: hours['weekdayHours'],
           zip_code_4: post_office['zip4'],
           zip_code_5: post_office['zip5'],
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 50a540f6f98..0d4020656ad 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -14,10 +14,14 @@
       url: user_password_path,
       html: { autocomplete: 'off', method: :post },
     ) do |f| %>
-  <%= f.input :email,
-              required: true,
-              input_html: { autocorrect: 'off',
-                            aria: { invalid: false, describedby: 'email-description' } } %>
+  <%= render ValidatedFieldComponent.new(
+        form: f,
+        name: :email,
+        label: t('account.index.email'),
+        required: true,
+        input_html: { autocorrect: 'off',
+                      aria: { describedby: 'email-description' } },
+      ) %>
   <%= f.input :request_id, as: :hidden, input_html: { value: request_id } %>
   <%= f.submit t('forms.buttons.continue'), class: 'display-block margin-y-5' %>
 <% end %>
diff --git a/app/views/idv/setup_errors/show.html.erb b/app/views/idv/setup_errors/show.html.erb
index 3769949e9f2..6633ca54579 100644
--- a/app/views/idv/setup_errors/show.html.erb
+++ b/app/views/idv/setup_errors/show.html.erb
@@ -11,7 +11,7 @@
       title: t('titles.failure.information_not_verified'),
       heading: t('idv.failure.setup.heading'),
     ) do %>
-  <p>
-    <%= t('idv.failure.setup.fail_html', contact_form_link: link_to(t('idv.failure.setup.link_text'), contact_redirect_url(flow: :idv, step: :secure_account)), support_code: IdentityConfig.store.lexisnexis_threatmetrix_support_code) %>
-  </p>
+    <p>
+        <%= t('idv.failure.setup.fail_html', support_code: IdentityConfig.store.lexisnexis_threatmetrix_support_code, contact_number: IdentityConfig.store.idv_contact_phone_number) %>
+    </p>
 <% end %>
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 8ced147618e..d2a081ddd01 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -33,11 +33,31 @@
   <![endif]-->
   <%= csrf_meta_tags %>
 
-  <link href="/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" />
-  <link href="/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png" />
-  <link href="/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png" />
+  <%= favicon_link_tag(
+        design_system_asset_path('img/favicons/apple-touch-icon.png'),
+        rel: 'apple-touch-icon',
+        sizes: '180x180',
+        type: 'image/png',
+      ) %>
+  <%= favicon_link_tag(
+        design_system_asset_path('img/favicons/favicon-40.png'),
+        rel: 'icon',
+        sizes: '40x40',
+        type: 'image/png',
+      ) %>
+  <%= favicon_link_tag(
+        design_system_asset_path('img/favicons/favicon-16.png'),
+        rel: 'icon',
+        sizes: '16x16',
+        type: 'image/png',
+      ) %>
   <link href="/manifest.json" rel="manifest" />
-  <link color="#e21c3d" href="/safari-pinned-tab.svg" rel="mask-icon" />
+  <%= favicon_link_tag(
+        design_system_asset_path('img/favicons/safari-pinned-tab.svg'),
+        rel: 'mask-icon',
+        color: '#e21c3d',
+        type: nil,
+      ) %>
   <meta content="#ffffff" name="theme-color" />
 
   <!--[if lt IE 9]>
diff --git a/config/application.yml.default b/config/application.yml.default
index bf3a6768f5d..e087b64de61 100644
--- a/config/application.yml.default
+++ b/config/application.yml.default
@@ -112,6 +112,7 @@ identity_pki_disabled: false
 identity_pki_local_dev: false
 idv_attempt_window_in_hours: 6
 idv_contact_url: https://www.example.com
+idv_contact_phone_number: (844) 555-5555
 idv_max_attempts: 5
 idv_min_age_years: 13
 idv_acuant_sdk_version_default: '11.7.1'
@@ -293,7 +294,6 @@ set_remember_device_session_expiration: false
 sp_handoff_bounce_max_seconds: 2
 show_user_attribute_deprecation_warnings: false
 otp_min_attempts_remaining_warning_count: 3
-show_account_recovery_recovery_options: false
 system_demand_report_email: 'foo@bar.com'
 test_ssn_allowed_list: ''
 totp_code_interval: 30
@@ -371,7 +371,7 @@ development:
   irs_attempt_api_enabled: true
   irs_attempt_api_aws_s3_enabled: false
   irs_attempt_api_auth_tokens: 'abc123'
-  irs_attempt_api_bucket_name: please-change-me
+  irs_attempt_api_bucket_name: default-placeholder
   logins_per_ip_limit: 5
   logo_upload_enabled: true
   max_bad_passwords: 5
@@ -391,7 +391,6 @@ development:
   scrypt_cost: 10000$8$1$
   secret_key_base: development_secret_key_base
   session_encryption_key: 27bad3c25711099429c1afdfd1890910f3b59f5a4faec1c85e945cb8b02b02f261ba501d99cfbb4fab394e0102de6fecf8ffe260f322f610db3e96b2a775c120
-  show_account_recovery_recovery_options: true
   skip_encryption_allowed_list: '["urn:gov:gsa:SAML:2.0.profiles:sp:sso:localhost"]'
   state_tracking_enabled: true
   telephony_adapter: test
diff --git a/config/ipp_pilot_usps_facilities.json b/config/ipp_pilot_usps_facilities.json
index 249d09ca2bc..99d1e1de2a9 100644
--- a/config/ipp_pilot_usps_facilities.json
+++ b/config/ipp_pilot_usps_facilities.json
@@ -13,10 +13,11 @@
           "sundayHours": "Closed"
         }
       ],
-      "distance": "0.0 mi",
+      "distance": "1.0 mi",
       "streetAddress": "900 E FAYETTE ST RM 118",
       "city": "BALTIMORE",
       "phone": "410-347-4202",
+      "tty": "222-222-2222",
       "name": "BALTIMORE",
       "zip4": "9715",
       "state": "MD",
@@ -35,10 +36,11 @@
           "sundayHours": "Closed"
         }
       ],
-      "distance": "0.0 mi",
+      "distance": "0.1 mi",
       "streetAddress": "6900 WISCONSIN AVE STE 100",
       "city": "CHEVY CHASE",
       "phone": "301-941-2670",
+      "tty": "222-222-2222",
       "name": "BETHESDA",
       "zip4": "9996",
       "state": "MD",
@@ -61,6 +63,7 @@
       "streetAddress": "4005 WISCONSIN AVE NW",
       "city": "WASHINGTON",
       "phone": "202-842-3332",
+      "tty": "222-222-2222",
       "name": "FRIENDSHIP",
       "zip4": "9997",
       "state": "DC",
@@ -79,10 +82,11 @@
           "sundayHours": "Closed"
         }
       ],
-      "distance": "0.0 mi",
+      "distance": "2.1 mi",
       "streetAddress": "900 BRENTWOOD RD NE",
       "city": "WASHINGTON",
       "phone": "202-636-1259",
+      "tty": "222-222-2222",
       "name": "WASHINGTON",
       "zip4": "9998",
       "state": "DC",
@@ -105,6 +109,7 @@
       "streetAddress": "3118 WASHINGTON BLVD",
       "city": "ARLINGTON",
       "phone": "703-993-0072",
+      "tty": "222-222-2222",
       "name": "ARLINGTON",
       "zip4": "9998",
       "state": "VA",
@@ -127,6 +132,7 @@
       "streetAddress": "44715 PRENTICE DR",
       "city": "DULLES",
       "phone": "703-406-6291",
+      "tty": "222-222-2222",
       "name": "ASHBURN",
       "zip4": "9996",
       "state": "VA",
@@ -149,6 +155,7 @@
       "streetAddress": "8409 LEE HWY",
       "city": "MERRIFIELD",
       "phone": "703-698-6377",
+      "tty": "222-222-2222",
       "name": "MERRIFIELD",
       "zip4": "9998",
       "state": "VA",
diff --git a/config/locales/idv/en.yml b/config/locales/idv/en.yml
index 2abe8540b18..cdd9734b7d3 100644
--- a/config/locales/idv/en.yml
+++ b/config/locales/idv/en.yml
@@ -82,10 +82,10 @@ en:
         warning: Please check the information you entered and try again. Common mistakes
           are an incorrect Social Security number or ZIP Code.
       setup:
-        fail_html: Please %{contact_form_link} and enter the code <b>%{support_code}</b>
-          in the detail field.
-        heading: There is an issue with your information
-        link_text: fill out our contact form
+        fail_html: 'Please call our contact center at <strong>%{contact_number}</strong>
+          to continue verifying your identity. You will need to provide them
+          with the error code <strong>%{support_code}</strong>.'
+        heading: Please give us a call
       timeout: We are experiencing higher than usual wait time processing your
         request. Please try again.
     forgot_password:
diff --git a/config/locales/idv/es.yml b/config/locales/idv/es.yml
index 9bd67783ebe..456c3e188c3 100644
--- a/config/locales/idv/es.yml
+++ b/config/locales/idv/es.yml
@@ -88,10 +88,11 @@ es:
           Los errores más comunes suelen producirse al ingresar un Número de
           Seguridad Social o un Código Postal incorrecto.
       setup:
-        fail_html: Por favor, %{contact_form_link} e introduzca el código
-          <b>%{support_code}</b> en el campo de detalle.
-        heading: Hay un problema con tu información
-        link_text: rellene nuestro formulario decontacto
+        fail_html: Llame a nuestro centro de contacto al
+          <strong>%{contact_number}</strong> para seguir verificando su
+          identidad. Deberá proporcionarnos el código de error
+          <strong>%{support_code}</strong>.
+        heading: Llámenos
       timeout: Estamos experimentando un tiempo de espera superior al habitual al
         procesar su solicitud. Inténtalo de nuevo.
     forgot_password:
diff --git a/config/locales/idv/fr.yml b/config/locales/idv/fr.yml
index 655dd5783d7..a4fced6deed 100644
--- a/config/locales/idv/fr.yml
+++ b/config/locales/idv/fr.yml
@@ -91,10 +91,11 @@ fr:
           Les erreurs les plus courantes sont un numéro de sécurité sociale ou
           un code postal incorrect.
       setup:
-        fail_html: Veuillez %{contact_form_link} et entrer le code
-          <b>%{support_code}</b> dans le champ de détail.
-        heading: Il y a un problème avec vos informations
-        link_text: remplir notre formulaire de contact
+        fail_html: Veuillez appeler notre centre de contact au
+          <strong>%{contact_number}</strong> pour poursuivre la vérification de
+          votre identité. Vous devrez leur fournir le code d’erreur
+          <strong>%{support_code}</strong>.
+        heading: S’il vous plaît, appelez-nous
       timeout: Le temps d’attente pour le traitement de votre demande est plus long
         que d’habitude Veuillez réessayer.
     forgot_password:
diff --git a/config/locales/in_person_proofing/en.yml b/config/locales/in_person_proofing/en.yml
index bf75a5be6ba..81ce6a60ebd 100644
--- a/config/locales/in_person_proofing/en.yml
+++ b/config/locales/in_person_proofing/en.yml
@@ -27,12 +27,17 @@ en:
           may be able to verify your ID in person at limited post office
           locations.
       location:
+        contact_info_heading: Contact Information
+        distance:
+          one: '%{count} mile away'
+          other: '%{count} miles away'
         inline_error: Include a city, state, and ZIP code
         location_button: Select
         location_step_about: If you are having trouble adding your ID, you may be able
           to verify in person at a local United States Post Office in select
           locations.
         none_found: No locations found.
+        phone: 'Phone:'
         po_search:
           address_search_hint: 'Example: 1960 W Chelsea Ave Allentown PA 18104'
           address_search_label: Enter an address to find a Post Office near you
@@ -55,6 +60,7 @@ en:
         retail_hours_sat: 'Sat:'
         retail_hours_sun: 'Sun:'
         retail_hours_weekday: 'Monday to Friday:'
+        tty: 'TTY:'
       prepare:
         alert_selected_post_office: You’ve selected the %{name} Post Office.
         privacy_disclaimer: '%{app_name} is a secure, government website. We and the
diff --git a/config/locales/in_person_proofing/es.yml b/config/locales/in_person_proofing/es.yml
index 557314541d1..d3f512720c4 100644
--- a/config/locales/in_person_proofing/es.yml
+++ b/config/locales/in_person_proofing/es.yml
@@ -30,12 +30,17 @@ es:
           puede verificar su identificación en persona en las oficinas de
           correos seleccionadas.
       location:
+        contact_info_heading: Información del contacto
+        distance:
+          one: '%{count} milla de distancia'
+          other: '%{count} millas de distancia'
         inline_error: Incluye una ciudad, un estado y un código postal.
         location_button: Seleccionar
         location_step_about: Si tiene problemas para añadir su cédula de identidad, es
           posible que pueda realizar la verificación en persona en una oficina
           de correos local de los Estados Unidos en determinadas localidades.
         none_found: No se encontraron localidades.
+        phone: 'Telefono:'
         po_search:
           address_search_hint: 'Ejemplo: 1960 W Chelsea Ave Allentown PA 18104'
           address_search_label: Introduzca una dirección para encontrar una Oficina de
@@ -61,6 +66,7 @@ es:
         retail_hours_sat: 'Sáb:'
         retail_hours_sun: 'Dom:'
         retail_hours_weekday: 'De Lunes a Viernes:'
+        tty: 'TTY:'
       prepare:
         alert_selected_post_office: Ha seleccionado la oficina de correos %{name}.
         privacy_disclaimer: '%{app_name} es un sitio web seguro del gobierno. Nosotros y
diff --git a/config/locales/in_person_proofing/fr.yml b/config/locales/in_person_proofing/fr.yml
index 3a2aaed8aaa..17cd7425b4b 100644
--- a/config/locales/in_person_proofing/fr.yml
+++ b/config/locales/in_person_proofing/fr.yml
@@ -31,12 +31,17 @@ fr:
           (Maryland), vous pourrez peut-être vérifier votre identité en personne
           dans certains bureaux de poste.
       location:
+        contact_info_heading: Information de contact
+        distance:
+          one: 'à %{count} mile'
+          other: 'à %{count} milles'
         inline_error: Indiquez la ville, l’État et le code postal.
         location_button: Sélectionner
         location_step_about: Si vous ne parvenez pas à ajouter votre pièce d’identité,
           vous pourrez peut-être vérifier en personne dans un bureau de poste
           américain local dans certains endroits.
         none_found: Aucun endroit trouvé.
+        phone: 'Téléphone:'
         po_search:
           address_search_hint: 'Exemple : 1960 W Chelsea Ave Allentown PA 18104'
           address_search_label: Entrez une adresse pour trouver un bureau de poste près de chez vous.
@@ -61,6 +66,7 @@ fr:
         retail_hours_sat: 'Sam:'
         retail_hours_sun: 'Dim:'
         retail_hours_weekday: 'Lundi à Vendredi:'
+        tty: 'ATS:'
       prepare:
         alert_selected_post_office: Vous avez sélectionné le bureau de poste de %{name}.
         privacy_disclaimer: '%{app_name} est un site gouvernemental sécurisé. Nous et le
diff --git a/lib/identity_config.rb b/lib/identity_config.rb
index a04dfe7fa62..44034750e4a 100644
--- a/lib/identity_config.rb
+++ b/lib/identity_config.rb
@@ -191,6 +191,7 @@ def self.build_store(config_map)
     config.add(:identity_pki_local_dev, type: :boolean)
     config.add(:idv_attempt_window_in_hours, type: :integer)
     config.add(:idv_contact_url, type: :string)
+    config.add(:idv_contact_phone_number, type: :string)
     config.add(:idv_max_attempts, type: :integer)
     config.add(:idv_min_age_years, type: :integer)
     config.add(:idv_acuant_sdk_version_default, type: :string)
@@ -387,7 +388,6 @@ def self.build_store(config_map)
     config.add(:ses_configuration_set_name, type: :string)
     config.add(:set_remember_device_session_expiration, type: :boolean)
     config.add(:show_user_attribute_deprecation_warnings, type: :boolean)
-    config.add(:show_account_recovery_recovery_options, type: :boolean)
     config.add(:skip_encryption_allowed_list, type: :json)
     config.add(:sp_handoff_bounce_max_seconds, type: :integer)
     config.add(:state_tracking_enabled, type: :boolean)
diff --git a/lib/tasks/review_profile.rake b/lib/tasks/review_profile.rake
new file mode 100644
index 00000000000..a296aab4d64
--- /dev/null
+++ b/lib/tasks/review_profile.rake
@@ -0,0 +1,45 @@
+require 'io/console'
+
+namespace :users do
+  namespace :review do
+    desc 'Pass a user that has a pending review'
+    task pass: :environment do |_task, args|
+      user_uuid = STDIN.getpass('Enter the User UUID to pass (input will be hidden):')
+      user = User.find_by(uuid: user_uuid)
+
+      if user.decorate.threatmetrix_review_pending? && user.proofing_component.review_eligible?
+        result = ProofingComponent.find_by(user: user)
+        result.update(threatmetrix_review_status: 'pass')
+        user.profiles.
+          where(deactivation_reason: 'threatmetrix_review_pending').
+          first.
+          activate
+        puts "User's review state has been updated to #{result.threatmetrix_review_status}."
+      elsif !user.proofing_component.review_eligible?
+        puts 'User is past the 30 day review eligibility'
+      else
+        puts 'User was not found pending a review'
+      end
+    end
+
+    desc 'Reject a user that has a pending review'
+    task reject: :environment do |_task, args|
+      user_uuid = STDIN.getpass('Enter the User UUID to reject (input will be hidden):')
+      user = User.find_by(uuid: user_uuid)
+
+      if user.decorate.threatmetrix_review_pending? && user.proofing_component.review_eligible?
+        result = ProofingComponent.find_by(user: user)
+        result.update(threatmetrix_review_status: 'reject')
+        user.profiles.
+          where(deactivation_reason: 'threatmetrix_review_pending').
+          first.
+          deactivate(:threatmetrix_review_rejected)
+        puts "User's review state has been updated to #{result.threatmetrix_review_status}."
+      elsif !user.proofing_component.review_eligible?
+        puts 'User is past the 30 day review eligibility'
+      else
+        puts 'User was not found pending a review'
+      end
+    end
+  end
+end
diff --git a/spec/factories/profiles.rb b/spec/factories/profiles.rb
index a8152e138e4..0a7730a6b4b 100644
--- a/spec/factories/profiles.rb
+++ b/spec/factories/profiles.rb
@@ -21,6 +21,11 @@
       deactivation_reason { :password_reset }
     end
 
+    trait :threatmetrix_review_pending do
+      deactivation_reason { :threatmetrix_review_pending }
+      proofing_components { { threatmetrix_review_status: 'review' } }
+    end
+
     trait :verification_cancelled do
       deactivation_reason { :verification_cancelled }
     end
diff --git a/spec/factories/proofing_components.rb b/spec/factories/proofing_components.rb
new file mode 100644
index 00000000000..da20ba72b2f
--- /dev/null
+++ b/spec/factories/proofing_components.rb
@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :proofing_component do
+    association :user, factory: %i[user signed_up]
+
+    trait :eligible_for_review do
+      verified_at { Time.zone.now }
+      threatmetrix_review_status { 'review' }
+    end
+  end
+end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index ac5a86c69fb..9c0598db224 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -210,6 +210,15 @@
       end
     end
 
+    trait :deactivated_threatmetrix_profile do
+      signed_up
+
+      after :build do |user|
+        create(:profile, :threatmetrix_review_pending, :with_pii, user: user)
+        create(:proofing_component, :eligible_for_review, user: user)
+      end
+    end
+
     trait :deactivated_password_reset_profile do
       signed_up
 
diff --git a/spec/features/account_reset/cancel_request_spec.rb b/spec/features/account_reset/cancel_request_spec.rb
index 3a41c851d3b..bfa6ef2c87d 100644
--- a/spec/features/account_reset/cancel_request_spec.rb
+++ b/spec/features/account_reset/cancel_request_spec.rb
@@ -7,6 +7,15 @@
       signin(user.email, user.password)
       click_link t('two_factor_authentication.login_options_link_text')
       click_link t('two_factor_authentication.account_reset.link')
+      expect(page).
+        to have_content strip_tags(
+          t('account_reset.recovery_options.try_method_again'),
+        )
+      click_link t('account_reset.request.yes_continue')
+      expect(page).
+        to have_content strip_tags(
+          t('account_reset.request.delete_account'),
+        )
       click_button t('account_reset.request.yes_continue')
       reset_email
 
diff --git a/spec/features/account_reset/delete_account_spec.rb b/spec/features/account_reset/delete_account_spec.rb
index f1fe12d60ca..61d0d786310 100644
--- a/spec/features/account_reset/delete_account_spec.rb
+++ b/spec/features/account_reset/delete_account_spec.rb
@@ -12,6 +12,15 @@
       signin(user_email, user.password)
       click_link t('two_factor_authentication.login_options_link_text')
       click_link t('two_factor_authentication.account_reset.link')
+      expect(page).
+        to have_content strip_tags(
+          t('account_reset.recovery_options.try_method_again'),
+        )
+      click_link t('account_reset.request.yes_continue')
+      expect(page).
+        to have_content strip_tags(
+          t('account_reset.request.delete_account'),
+        )
       click_button t('account_reset.request.yes_continue')
 
       expect(page).
@@ -69,6 +78,19 @@
       signin(user_email, user.password)
       click_link t('two_factor_authentication.login_options_link_text')
       click_link t('two_factor_authentication.account_reset.link')
+
+      expect(page).
+        to have_content strip_tags(
+          t('account_reset.recovery_options.try_method_again'),
+        )
+
+      click_link t('account_reset.request.yes_continue')
+
+      expect(page).
+        to have_content strip_tags(
+          t('account_reset.request.delete_account'),
+        )
+
       click_button t('account_reset.request.yes_continue')
 
       expect(page).
@@ -121,6 +143,15 @@
       signin(user_email, user.password)
       click_link t('two_factor_authentication.login_options_link_text')
       click_link t('two_factor_authentication.account_reset.link')
+      expect(page).
+        to have_content strip_tags(
+          t('account_reset.recovery_options.try_method_again'),
+        )
+      click_link t('account_reset.request.yes_continue')
+      expect(page).
+        to have_content strip_tags(
+          t('account_reset.request.delete_account'),
+        )
       click_button t('account_reset.request.yes_continue')
 
       expect(page).
@@ -142,25 +173,4 @@
       expect(page).to have_current_path(new_user_session_path)
     end
   end
-
-  context 'as an IAL2 user' do
-    let(:user) do
-      create(
-        :profile,
-        :active,
-        :verified,
-        pii: { first_name: 'John', ssn: '111223333' },
-      ).user
-    end
-
-    it 'does allow the user to delete their account from 2FA screen' do
-      signin(user_email, user.password)
-      click_link t('two_factor_authentication.login_options_link_text')
-
-      # Visiting account reset directly should redirect to 2FA
-      visit account_reset_request_path
-
-      expect(page.current_path).to eq(account_reset_request_path)
-    end
-  end
 end
diff --git a/spec/features/account_reset/pending_request_spec.rb b/spec/features/account_reset/pending_request_spec.rb
index 67ad332c87d..628f7d230dd 100644
--- a/spec/features/account_reset/pending_request_spec.rb
+++ b/spec/features/account_reset/pending_request_spec.rb
@@ -8,6 +8,15 @@
     sign_in_user(user)
     click_link t('two_factor_authentication.login_options_link_text')
     click_link t('two_factor_authentication.account_reset.link')
+    expect(page).
+      to have_content strip_tags(
+        t('account_reset.recovery_options.try_method_again'),
+      )
+    click_link t('account_reset.request.yes_continue')
+    expect(page).
+      to have_content strip_tags(
+        t('account_reset.request.delete_account'),
+      )
     click_button t('account_reset.request.yes_continue')
 
     Capybara.reset_session!
diff --git a/spec/features/idv/in_person_spec.rb b/spec/features/idv/in_person_spec.rb
index ea304697cbe..65b79e5ef51 100644
--- a/spec/features/idv/in_person_spec.rb
+++ b/spec/features/idv/in_person_spec.rb
@@ -319,8 +319,12 @@
         complete_doc_auth_steps_before_send_link_step
         fill_in :doc_auth_phone, with: '415-555-0199'
         click_idv_continue
+
+        expect(page).to have_content(t('doc_auth.headings.text_message'))
       end
 
+      expect(@sms_link).to be_present
+
       perform_in_browser(:mobile) do
         visit @sms_link
         mock_doc_auth_attention_with_barcode
diff --git a/spec/features/multiple_emails/reset_password_spec.rb b/spec/features/multiple_emails/reset_password_spec.rb
index 71b18b5b894..6f032d1d922 100644
--- a/spec/features/multiple_emails/reset_password_spec.rb
+++ b/spec/features/multiple_emails/reset_password_spec.rb
@@ -7,7 +7,7 @@
 
     visit root_path
     click_link t('links.passwords.forgot')
-    fill_in 'Email', with: email1
+    fill_in t('account.index.email'), with: email1
     click_button t('forms.buttons.continue')
 
     expect_delivered_email_count(1)
@@ -20,7 +20,7 @@
 
     visit root_path
     click_link t('links.passwords.forgot')
-    fill_in 'Email', with: email2
+    fill_in t('account.index.email'), with: email2
     click_button t('forms.buttons.continue')
 
     expect_delivered_email_count(2)
@@ -42,7 +42,7 @@
 
     visit root_path
     click_link t('links.passwords.forgot')
-    fill_in 'Email', with: unconfirmed_email_address.email
+    fill_in t('account.index.email'), with: unconfirmed_email_address.email
     click_button t('forms.buttons.continue')
 
     expect_delivered_email_count(1)
diff --git a/spec/features/users/sign_in_spec.rb b/spec/features/users/sign_in_spec.rb
index 31614b5eda7..fc650729d3e 100644
--- a/spec/features/users/sign_in_spec.rb
+++ b/spec/features/users/sign_in_spec.rb
@@ -362,7 +362,7 @@
       allow(Devise).to receive(:timeout_in).and_return(1)
       user = create(:user)
       visit root_path
-      fill_in 'Email', with: user.email
+      fill_in t('account.index.email'), with: user.email
       fill_in 'Password', with: user.password
 
       expect(page).to have_content(
diff --git a/spec/features/visitors/password_recovery_spec.rb b/spec/features/visitors/password_recovery_spec.rb
index 8d2ec6fe37f..26d6eb91e65 100644
--- a/spec/features/visitors/password_recovery_spec.rb
+++ b/spec/features/visitors/password_recovery_spec.rb
@@ -11,7 +11,7 @@
 
       visit root_path
       click_link t('links.passwords.forgot')
-      fill_in 'Email', with: user.email
+      fill_in t('account.index.email'), with: user.email
 
       expect(PushNotification::HttpPush).to receive(:deliver).
         with(PushNotification::RecoveryActivatedEvent.new(user: user))
@@ -99,7 +99,7 @@
     before do
       user = create(:user)
       visit new_user_password_path
-      fill_in 'Email', with: user.email
+      fill_in t('account.index.email'), with: user.email
       click_button t('forms.buttons.continue')
       visit edit_user_password_path(reset_password_token: 'invalid_token')
     end
@@ -143,7 +143,7 @@
       @user = create(:user, :signed_up)
 
       visit new_user_password_path
-      fill_in 'Email', with: @user.email
+      fill_in t('account.index.email'), with: @user.email
       click_button t('forms.buttons.continue')
 
       raw_reset_token, db_confirmation_token =
@@ -226,7 +226,7 @@
     user = create(:user, :signed_up)
 
     visit new_user_password_path
-    fill_in 'Email', with: user.email
+    fill_in t('account.index.email'), with: user.email
     click_button t('forms.buttons.continue')
 
     user.reset_password_sent_at =
@@ -261,7 +261,7 @@
 
   def submit_email_for_password_reset(email)
     visit new_user_password_path
-    fill_in 'Email', with: email
+    fill_in t('account.index.email'), with: email
     click_button t('forms.buttons.continue')
   end
 end
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index fe11f2cec91..d5c30ff5d95 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -17,6 +17,8 @@ class BaseTask
         { key: 'doc_auth.headings.photo', locales: %i[fr] }, # "Photo" is "Photo" in French
         { key: /^i18n\.locale\./ }, # Show locale options translated as that language
         { key: /^countries/ }, # Some countries have the same name across languages
+        { key: 'in_person_proofing.body.location.tty', locales: %i[es] },
+        # "TTY" is "TTY" in Spanish
         { key: 'links.contact', locales: %i[fr] }, # "Contact" is "Contact" in French
         { key: 'simple_form.no', locales: %i[es] }, # "No" is "No" in Spanish
         { key: 'simple_form.required.html' }, # No text content
diff --git a/spec/jobs/job_helpers/s3_helper_spec.rb b/spec/jobs/job_helpers/s3_helper_spec.rb
index da69847e3aa..a144d34ed00 100644
--- a/spec/jobs/job_helpers/s3_helper_spec.rb
+++ b/spec/jobs/job_helpers/s3_helper_spec.rb
@@ -52,7 +52,7 @@
         "https://s3.region-name.amazonaws.com/#{bucket_name}/#{prefix}?param=true&signature=123"
       end
 
-      it 'downloads by extracing prefix and bucket from s3 URLs' do
+      it 'downloads by extracting prefix and bucket from s3 URLs' do
         expect(s3_helper.download(url)).to eq(body)
       end
     end
@@ -62,7 +62,7 @@
         "https://#{bucket_name}.s3.region-name.amazonaws.com/#{prefix}?param=true&signature=123"
       end
 
-      it 'downloads by extracing prefix and bucket from s3 URLs' do
+      it 'downloads by extracting prefix and bucket from s3 URLs' do
         expect(s3_helper.download(url)).to eq(body)
       end
     end
@@ -83,4 +83,63 @@
       expect(s3_helper.download(url).encoding.name).to eq('ASCII-8BIT')
     end
   end
+
+  let(:valid_bucket_name) { 'valid-attempts-api-s3-bucket' }
+
+  describe '#attempts_bucket_methods' do
+    subject(:attempts_s3_write_enabled) { s3_helper.attempts_s3_write_enabled }
+
+    context 'with no bucket name' do
+      it 'should return nil' do
+        allow(IdentityConfig.store).to receive(:irs_attempt_api_bucket_name).and_return(nil)
+        is_expected.to eq(nil)
+      end
+    end
+
+    context 'with a default bucket name' do
+      it 'should return false' do
+        allow(IdentityConfig.store).to receive(:irs_attempt_api_bucket_name).
+          and_return('default-placeholder')
+        is_expected.to eq(false)
+      end
+    end
+
+    context 'with a valid bucket name' do
+      it 'should return true' do
+        allow(IdentityConfig.store).to receive(:irs_attempt_api_bucket_name).
+          and_return(valid_bucket_name)
+        is_expected.to eq(true)
+      end
+    end
+  end
+
+  describe '#attempts_serve_events_from_s3' do
+    subject(:attempts_serve_events_from_s3) { s3_helper.attempts_serve_events_from_s3 }
+
+    context 'with s3 disabled and a valid s3 bucket' do
+      it 'should return false' do
+        allow(IdentityConfig.store).to receive(:irs_attempt_api_aws_s3_enabled).and_return(false)
+        allow(IdentityConfig.store).to receive(:irs_attempt_api_bucket_name).
+          and_return(valid_bucket_name)
+        is_expected.to eq(false)
+      end
+    end
+
+    context 'with s3 disabled and no s3 bucket' do
+      it 'should return false' do
+        allow(IdentityConfig.store).to receive(:irs_attempt_api_aws_s3_enabled).and_return(false)
+        allow(IdentityConfig.store).to receive(:irs_attempt_api_bucket_name).and_return(nil)
+        is_expected.to eq(false)
+      end
+    end
+
+    context 'with s3 enabled and a valid s3 bucket' do
+      it 'should return true' do
+        allow(IdentityConfig.store).to receive(:irs_attempt_api_aws_s3_enabled).and_return(true)
+        allow(IdentityConfig.store).to receive(:irs_attempt_api_bucket_name).
+          and_return('valid-attempts-api-s3-bucket')
+        is_expected.to eq(true)
+      end
+    end
+  end
 end
diff --git a/spec/lib/tasks/review_profile_spec.rb b/spec/lib/tasks/review_profile_spec.rb
new file mode 100644
index 00000000000..9af26481232
--- /dev/null
+++ b/spec/lib/tasks/review_profile_spec.rb
@@ -0,0 +1,33 @@
+require 'rails_helper'
+require 'rake'
+
+describe 'review_profile' do
+  before do
+    Rake.application.rake_require('lib/tasks/review_profile', [Rails.root.to_s])
+    Rake::Task.define_task(:environment)
+  end
+
+  describe 'users:review:pass' do
+    it 'sets threatmetrix_review_status to pass' do
+      user = create(:user, :deactivated_threatmetrix_profile)
+
+      allow(STDIN).to receive(:getpass) { user.uuid }
+
+      Rake::Task['users:review:pass'].invoke
+      expect(user.reload.proofing_component.threatmetrix_review_status).to eq('pass')
+      expect(user.reload.profiles.first.active).to eq(true)
+    end
+  end
+
+  describe 'users:review:reject' do
+    it 'sets threatmetrix_review_status to reject' do
+      user = create(:user, :deactivated_threatmetrix_profile)
+
+      allow(STDIN).to receive(:getpass) { user.uuid }
+
+      Rake::Task['users:review:reject'].invoke
+      expect(user.reload.proofing_component.threatmetrix_review_status).to eq('reject')
+      expect(user.reload.profiles.first.deactivation_reason).to eq('threatmetrix_review_rejected')
+    end
+  end
+end
diff --git a/spec/presenters/two_factor_auth_code/phone_delivery_presenter_spec.rb b/spec/presenters/two_factor_auth_code/phone_delivery_presenter_spec.rb
index 8e96f5b4510..a0068522f47 100644
--- a/spec/presenters/two_factor_auth_code/phone_delivery_presenter_spec.rb
+++ b/spec/presenters/two_factor_auth_code/phone_delivery_presenter_spec.rb
@@ -72,7 +72,7 @@ def account_reset_delete_account_link
       'two_factor_authentication.account_reset.text_html', link:
       view.link_to(
         t('two_factor_authentication.account_reset.link'),
-        account_reset_request_path(locale: LinkLocaleResolver.locale),
+        account_reset_recovery_options_path(locale: LinkLocaleResolver.locale),
       )
     )
   end
diff --git a/spec/presenters/two_factor_login_options_presenter_spec.rb b/spec/presenters/two_factor_login_options_presenter_spec.rb
index 57672582243..0414170a3f0 100644
--- a/spec/presenters/two_factor_login_options_presenter_spec.rb
+++ b/spec/presenters/two_factor_login_options_presenter_spec.rb
@@ -51,22 +51,6 @@
     allow_any_instance_of(TwoFactorLoginOptionsPresenter).to \
       receive(:account_reset_token_valid?).and_return(false)
 
-    expect(presenter.account_reset_or_cancel_link).to eq \
-      t(
-        'two_factor_authentication.account_reset.text_html',
-        link: view.link_to(
-          t('two_factor_authentication.account_reset.link'),
-          account_reset_request_path(locale: LinkLocaleResolver.locale),
-        ),
-      )
-  end
-
-  it 'supplies a recovery options link when feature toggle is on' do
-    allow(IdentityConfig.store).to \
-      receive(:show_account_recovery_recovery_options).and_return(true)
-    allow_any_instance_of(TwoFactorLoginOptionsPresenter).to \
-      receive(:account_reset_token_valid?).and_return(false)
-
     expect(presenter.account_reset_or_cancel_link).to eq \
       t(
         'two_factor_authentication.account_reset.text_html',
diff --git a/spec/support/features/document_capture_step_helper.rb b/spec/support/features/document_capture_step_helper.rb
index ac722b122a1..8a8b5f37e48 100644
--- a/spec/support/features/document_capture_step_helper.rb
+++ b/spec/support/features/document_capture_step_helper.rb
@@ -3,7 +3,6 @@ def submit_images
     click_on 'Submit'
 
     # Wait for the the loading interstitial to disappear before continuing
-    expect(page).to have_content(t('doc_auth.headings.interstitial'))
     expect(page).not_to have_content(t('doc_auth.headings.interstitial'), wait: 10)
   end
 
diff --git a/spec/support/features/personal_key_helper.rb b/spec/support/features/personal_key_helper.rb
index a773b451412..8135f275641 100644
--- a/spec/support/features/personal_key_helper.rb
+++ b/spec/support/features/personal_key_helper.rb
@@ -21,7 +21,7 @@ def personal_key_from_pii(user, pii)
 
   def trigger_reset_password_and_click_email_link(email)
     visit new_user_password_path
-    fill_in 'Email', with: email
+    fill_in t('account.index.email'), with: email
     click_button t('forms.buttons.continue')
     open_last_email
     click_email_link_matching(/reset_password_token/)
diff --git a/spec/views/idv/setup_errors/show.html.erb_spec.rb b/spec/views/idv/setup_errors/show.html.erb_spec.rb
index e9699fe5419..d6021cb42a2 100644
--- a/spec/views/idv/setup_errors/show.html.erb_spec.rb
+++ b/spec/views/idv/setup_errors/show.html.erb_spec.rb
@@ -17,8 +17,8 @@
       strip_tags(
         t(
           'idv.failure.setup.fail_html',
-          contact_form_link: t('idv.failure.setup.link_text'),
           support_code: 'ABCD',
+          contact_number: '(844) 555-5555',
         ),
       ),
     )