diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a44324d5..f6bfba5e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,18 +6,20 @@
 
 **Implemented enhancements:**
 
+- \[RUBY-3316\] Add context to delete user action [\#1573](https://github.com/DEFRA/waste-carriers-engine/pull/1573) ([brujeo](https://github.com/brujeo))
+- \[RUBY-3375\] Configure Govpay callback endpoint to authenticate both front and back office accounts [\#1572](https://github.com/DEFRA/waste-carriers-engine/pull/1572) ([jjromeo](https://github.com/jjromeo))
 - \[RUBY-3219\] Refactor `GovpayFindPaymentService` to support finding payments that are inside a transient registration as this is used in GovpayUpdateRefundStatusService to locate the payment [\#1562](https://github.com/DEFRA/waste-carriers-engine/pull/1562) ([jjromeo](https://github.com/jjromeo))
-- Process Gov.UK Pay webhook callbacks [\#1555](https://github.com/DEFRA/waste-carriers-engine/pull/1555) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Process Gov.UK Pay webhook callbacks [\#1555](https://github.com/DEFRA/waste-carriers-engine/pull/1555) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - \[RUBY-3221\] adjusting content of renewal block page [\#1551](https://github.com/DEFRA/waste-carriers-engine/pull/1551) ([brujeo](https://github.com/brujeo))
 - \[RUBY-3215\] Add `payment_balance` method and enhance refund payment handling [\#1550](https://github.com/DEFRA/waste-carriers-engine/pull/1550) ([jjromeo](https://github.com/jjromeo))
 - RUBY 3081 wcr unblock northern ireland location continue journey [\#1535](https://github.com/DEFRA/waste-carriers-engine/pull/1535) ([jjromeo](https://github.com/jjromeo))
 - RUBY 3079 wcr renewal emails are sent to registraton contact email address not renewal email address if different [\#1533](https://github.com/DEFRA/waste-carriers-engine/pull/1533) ([jjromeo](https://github.com/jjromeo))
-- Feature/ruby 2973 unsubscribe [\#1519](https://github.com/DEFRA/waste-carriers-engine/pull/1519) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Feature/ruby 2973 unsubscribe [\#1519](https://github.com/DEFRA/waste-carriers-engine/pull/1519) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Make email validation case-insensitive in certificates controller and update tests [\#1518](https://github.com/DEFRA/waste-carriers-engine/pull/1518) ([jjromeo](https://github.com/jjromeo))
-- Feature/ruby 2846 certificate versioning [\#1506](https://github.com/DEFRA/waste-carriers-engine/pull/1506) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Feature/ruby 2846 certificate versioning [\#1506](https://github.com/DEFRA/waste-carriers-engine/pull/1506) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - \[RUBY-2845\] Update heading tags from h2/h3 to h1 for accessibility in renewal templates [\#1504](https://github.com/DEFRA/waste-carriers-engine/pull/1504) ([jjromeo](https://github.com/jjromeo))
-- Add not England completion pages [\#1503](https://github.com/DEFRA/waste-carriers-engine/pull/1503) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Add back-office user journey completion pages [\#1495](https://github.com/DEFRA/waste-carriers-engine/pull/1495) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Add not England completion pages [\#1503](https://github.com/DEFRA/waste-carriers-engine/pull/1503) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Add back-office user journey completion pages [\#1495](https://github.com/DEFRA/waste-carriers-engine/pull/1495) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - RUBY 2845 wcr handle expired certificate link [\#1494](https://github.com/DEFRA/waste-carriers-engine/pull/1494) ([jjromeo](https://github.com/jjromeo))
 - RUBY 2794 wcr track communications history per registration [\#1488](https://github.com/DEFRA/waste-carriers-engine/pull/1488) ([jjromeo](https://github.com/jjromeo))
 - \[RUBY-2802\] Add token for viewing certificates and remove carrier telephone number from waste certificate PDF template [\#1486](https://github.com/DEFRA/waste-carriers-engine/pull/1486) ([jjromeo](https://github.com/jjromeo))
@@ -29,39 +31,39 @@
 - \[RUBY-2780\] content change [\#1470](https://github.com/DEFRA/waste-carriers-engine/pull/1470) ([brujeo](https://github.com/brujeo))
 - Feature/ruby 2788 wcr content convictions page addition [\#1469](https://github.com/DEFRA/waste-carriers-engine/pull/1469) ([brujeo](https://github.com/brujeo))
 - RUBY 2709 wcr analytics metrics improvements [\#1460](https://github.com/DEFRA/waste-carriers-engine/pull/1460) ([jjromeo](https://github.com/jjromeo))
-- Add new cannot-register pages for non-england locations [\#1456](https://github.com/DEFRA/waste-carriers-engine/pull/1456) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Add new cannot-register pages for non-england locations [\#1456](https://github.com/DEFRA/waste-carriers-engine/pull/1456) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Feature/ruby 2533 certificate generator service [\#1438](https://github.com/DEFRA/waste-carriers-engine/pull/1438) ([brujeo](https://github.com/brujeo))
 - \[RUBY-2625\] ensure only upper tier registrations come back from conviction scope methods [\#1426](https://github.com/DEFRA/waste-carriers-engine/pull/1426) ([jjromeo](https://github.com/jjromeo))
 - \[RUBY-2534\] Update content on conviction page to reflect changes [\#1424](https://github.com/DEFRA/waste-carriers-engine/pull/1424) ([jjromeo](https://github.com/jjromeo))
 - sonar cloud config update [\#1416](https://github.com/DEFRA/waste-carriers-engine/pull/1416) ([brujeo](https://github.com/brujeo))
-- Feature/user journey analytics [\#1414](https://github.com/DEFRA/waste-carriers-engine/pull/1414) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Feature/user journey analytics [\#1414](https://github.com/DEFRA/waste-carriers-engine/pull/1414) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Fix/wcr simplecov json formatter [\#1411](https://github.com/DEFRA/waste-carriers-engine/pull/1411) ([brujeo](https://github.com/brujeo))
 - RUBY-2633: reconfiguring simplecov and sonar-cloud to use coverage.json [\#1409](https://github.com/DEFRA/waste-carriers-engine/pull/1409) ([brujeo](https://github.com/brujeo))
 - Feature/ruby 2612 fb tech debt unit tests [\#1407](https://github.com/DEFRA/waste-carriers-engine/pull/1407) ([brujeo](https://github.com/brujeo))
 - Feature/ruby 2533 wcr changes to certificates for numbering copies [\#1404](https://github.com/DEFRA/waste-carriers-engine/pull/1404) ([brujeo](https://github.com/brujeo))
-- duty-of-care content [\#1402](https://github.com/DEFRA/waste-carriers-engine/pull/1402) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Add renewal-stop form [\#1393](https://github.com/DEFRA/waste-carriers-engine/pull/1393) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix/area service [\#1391](https://github.com/DEFRA/waste-carriers-engine/pull/1391) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- duty-of-care content [\#1402](https://github.com/DEFRA/waste-carriers-engine/pull/1402) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Add renewal-stop form [\#1393](https://github.com/DEFRA/waste-carriers-engine/pull/1393) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/area service [\#1391](https://github.com/DEFRA/waste-carriers-engine/pull/1391) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - RUBY-2497: Add method to get original registration date [\#1388](https://github.com/DEFRA/waste-carriers-engine/pull/1388) ([brujeo](https://github.com/brujeo))
-- Payment confirmation content fixes [\#1387](https://github.com/DEFRA/waste-carriers-engine/pull/1387) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- confirm payment method [\#1386](https://github.com/DEFRA/waste-carriers-engine/pull/1386) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Update declaration content [\#1383](https://github.com/DEFRA/waste-carriers-engine/pull/1383) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Move conviction type detail to a static page [\#1374](https://github.com/DEFRA/waste-carriers-engine/pull/1374) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- cert creation date [\#1362](https://github.com/DEFRA/waste-carriers-engine/pull/1362) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- delete person label [\#1360](https://github.com/DEFRA/waste-carriers-engine/pull/1360) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Add restore attributes to metaData [\#1349](https://github.com/DEFRA/waste-carriers-engine/pull/1349) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Email history [\#1339](https://github.com/DEFRA/waste-carriers-engine/pull/1339) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Deregistration confirmation email [\#1329](https://github.com/DEFRA/waste-carriers-engine/pull/1329) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Feature/dereg conf email [\#1328](https://github.com/DEFRA/waste-carriers-engine/pull/1328) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Confirm deregistration [\#1324](https://github.com/DEFRA/waste-carriers-engine/pull/1324) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Update link handling error pages [\#1321](https://github.com/DEFRA/waste-carriers-engine/pull/1321) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- deregister link [\#1320](https://github.com/DEFRA/waste-carriers-engine/pull/1320) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Content updates [\#1286](https://github.com/DEFRA/waste-carriers-engine/pull/1286) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Minor content updates [\#1285](https://github.com/DEFRA/waste-carriers-engine/pull/1285) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Companies house fixes [\#1281](https://github.com/DEFRA/waste-carriers-engine/pull/1281) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- EPR pending convictions check [\#1278](https://github.com/DEFRA/waste-carriers-engine/pull/1278) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Support tracking partial AD registrations [\#1276](https://github.com/DEFRA/waste-carriers-engine/pull/1276) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Update text regarding confirmation emails being sent [\#1275](https://github.com/DEFRA/waste-carriers-engine/pull/1275) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Payment confirmation content fixes [\#1387](https://github.com/DEFRA/waste-carriers-engine/pull/1387) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- confirm payment method [\#1386](https://github.com/DEFRA/waste-carriers-engine/pull/1386) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Update declaration content [\#1383](https://github.com/DEFRA/waste-carriers-engine/pull/1383) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Move conviction type detail to a static page [\#1374](https://github.com/DEFRA/waste-carriers-engine/pull/1374) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- cert creation date [\#1362](https://github.com/DEFRA/waste-carriers-engine/pull/1362) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- delete person label [\#1360](https://github.com/DEFRA/waste-carriers-engine/pull/1360) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Add restore attributes to metaData [\#1349](https://github.com/DEFRA/waste-carriers-engine/pull/1349) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Email history [\#1339](https://github.com/DEFRA/waste-carriers-engine/pull/1339) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Deregistration confirmation email [\#1329](https://github.com/DEFRA/waste-carriers-engine/pull/1329) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Feature/dereg conf email [\#1328](https://github.com/DEFRA/waste-carriers-engine/pull/1328) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Confirm deregistration [\#1324](https://github.com/DEFRA/waste-carriers-engine/pull/1324) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Update link handling error pages [\#1321](https://github.com/DEFRA/waste-carriers-engine/pull/1321) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- deregister link [\#1320](https://github.com/DEFRA/waste-carriers-engine/pull/1320) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Content updates [\#1286](https://github.com/DEFRA/waste-carriers-engine/pull/1286) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Minor content updates [\#1285](https://github.com/DEFRA/waste-carriers-engine/pull/1285) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Companies house fixes [\#1281](https://github.com/DEFRA/waste-carriers-engine/pull/1281) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- EPR pending convictions check [\#1278](https://github.com/DEFRA/waste-carriers-engine/pull/1278) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Support tracking partial AD registrations [\#1276](https://github.com/DEFRA/waste-carriers-engine/pull/1276) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Update text regarding confirmation emails being sent [\#1275](https://github.com/DEFRA/waste-carriers-engine/pull/1275) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Fixing the partial telephone match [\#1263](https://github.com/DEFRA/waste-carriers-engine/pull/1263) ([Beckyrose200](https://github.com/Beckyrose200))
 - Adding in telephone to the search terms [\#1262](https://github.com/DEFRA/waste-carriers-engine/pull/1262) ([Beckyrose200](https://github.com/Beckyrose200))
 - Text change for registration complete sending a letter [\#1260](https://github.com/DEFRA/waste-carriers-engine/pull/1260) ([Beckyrose200](https://github.com/Beckyrose200))
@@ -69,48 +71,48 @@
 - Feature/letter for renewal confirmation [\#1258](https://github.com/DEFRA/waste-carriers-engine/pull/1258) ([Beckyrose200](https://github.com/Beckyrose200))
 - Companies House API down page [\#1248](https://github.com/DEFRA/waste-carriers-engine/pull/1248) ([Beckyrose200](https://github.com/Beckyrose200))
 - Adding in CH API down error handling [\#1245](https://github.com/DEFRA/waste-carriers-engine/pull/1245) ([Beckyrose200](https://github.com/Beckyrose200))
-- Feature/ad nil email [\#1242](https://github.com/DEFRA/waste-carriers-engine/pull/1242) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Contact email optional [\#1224](https://github.com/DEFRA/waste-carriers-engine/pull/1224) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Renewals: Ruse business address as contact address [\#1213](https://github.com/DEFRA/waste-carriers-engine/pull/1213) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Feature/ad nil email [\#1242](https://github.com/DEFRA/waste-carriers-engine/pull/1242) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Contact email optional [\#1224](https://github.com/DEFRA/waste-carriers-engine/pull/1224) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Renewals: Ruse business address as contact address [\#1213](https://github.com/DEFRA/waste-carriers-engine/pull/1213) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Business name hint text update [\#1209](https://github.com/DEFRA/waste-carriers-engine/pull/1209) ([timstone](https://github.com/timstone))
-- Add tier level to trading name hint i18n [\#1205](https://github.com/DEFRA/waste-carriers-engine/pull/1205) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Use trading name form [\#1194](https://github.com/DEFRA/waste-carriers-engine/pull/1194) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Reset company details when location changes to overseas [\#1174](https://github.com/DEFRA/waste-carriers-engine/pull/1174) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix typo in company\_name\_form content [\#1172](https://github.com/DEFRA/waste-carriers-engine/pull/1172) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Move main\_people form before company\_name form [\#1171](https://github.com/DEFRA/waste-carriers-engine/pull/1171) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Update hint text for sole trader business name [\#1170](https://github.com/DEFRA/waste-carriers-engine/pull/1170) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Move the main people form before the company address forms  [\#1167](https://github.com/DEFRA/waste-carriers-engine/pull/1167) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Move the main people form before the company address forms [\#1166](https://github.com/DEFRA/waste-carriers-engine/pull/1166) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Reset invalid renewal workflow\_state value before resuming a renewal [\#1160](https://github.com/DEFRA/waste-carriers-engine/pull/1160) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Overseas renewals navigate to cbd-type form [\#1158](https://github.com/DEFRA/waste-carriers-engine/pull/1158) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Remove check tier flow from renewal journey [\#1157](https://github.com/DEFRA/waste-carriers-engine/pull/1157) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Remove company number form from the renewals journey [\#1149](https://github.com/DEFRA/waste-carriers-engine/pull/1149) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Legal entities changes for renewals [\#1148](https://github.com/DEFRA/waste-carriers-engine/pull/1148) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Add tier level to trading name hint i18n [\#1205](https://github.com/DEFRA/waste-carriers-engine/pull/1205) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Use trading name form [\#1194](https://github.com/DEFRA/waste-carriers-engine/pull/1194) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Reset company details when location changes to overseas [\#1174](https://github.com/DEFRA/waste-carriers-engine/pull/1174) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix typo in company\_name\_form content [\#1172](https://github.com/DEFRA/waste-carriers-engine/pull/1172) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Move main\_people form before company\_name form [\#1171](https://github.com/DEFRA/waste-carriers-engine/pull/1171) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Update hint text for sole trader business name [\#1170](https://github.com/DEFRA/waste-carriers-engine/pull/1170) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Move the main people form before the company address forms  [\#1167](https://github.com/DEFRA/waste-carriers-engine/pull/1167) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Move the main people form before the company address forms [\#1166](https://github.com/DEFRA/waste-carriers-engine/pull/1166) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Reset invalid renewal workflow\_state value before resuming a renewal [\#1160](https://github.com/DEFRA/waste-carriers-engine/pull/1160) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Overseas renewals navigate to cbd-type form [\#1158](https://github.com/DEFRA/waste-carriers-engine/pull/1158) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Remove check tier flow from renewal journey [\#1157](https://github.com/DEFRA/waste-carriers-engine/pull/1157) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Remove company number form from the renewals journey [\#1149](https://github.com/DEFRA/waste-carriers-engine/pull/1149) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Legal entities changes for renewals [\#1148](https://github.com/DEFRA/waste-carriers-engine/pull/1148) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Reject Companies House data [\#1147](https://github.com/DEFRA/waste-carriers-engine/pull/1147) ([Beckyrose200](https://github.com/Beckyrose200))
 - 'Change company house details' link opens in a new window [\#1144](https://github.com/DEFRA/waste-carriers-engine/pull/1144) ([Beckyrose200](https://github.com/Beckyrose200))
-- Do not deduplicate "trading as" for lower-tier entities [\#1143](https://github.com/DEFRA/waste-carriers-engine/pull/1143) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Do not deduplicate "trading as" for lower-tier entities [\#1143](https://github.com/DEFRA/waste-carriers-engine/pull/1143) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Registered Company Name saved to the transient registration [\#1140](https://github.com/DEFRA/waste-carriers-engine/pull/1140) ([Beckyrose200](https://github.com/Beckyrose200))
-- Build address from OS Places elements [\#1138](https://github.com/DEFRA/waste-carriers-engine/pull/1138) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Add hint text on the address page [\#1137](https://github.com/DEFRA/waste-carriers-engine/pull/1137) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Deduplicate "trading as" in business name [\#1136](https://github.com/DEFRA/waste-carriers-engine/pull/1136) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Make sole trader business name mandatory for lower-tier registrations [\#1135](https://github.com/DEFRA/waste-carriers-engine/pull/1135) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Update text and hint on business name page for sole traders [\#1134](https://github.com/DEFRA/waste-carriers-engine/pull/1134) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Build address from OS Places elements [\#1138](https://github.com/DEFRA/waste-carriers-engine/pull/1138) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Add hint text on the address page [\#1137](https://github.com/DEFRA/waste-carriers-engine/pull/1137) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Deduplicate "trading as" in business name [\#1136](https://github.com/DEFRA/waste-carriers-engine/pull/1136) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Make sole trader business name mandatory for lower-tier registrations [\#1135](https://github.com/DEFRA/waste-carriers-engine/pull/1135) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Update text and hint on business name page for sole traders [\#1134](https://github.com/DEFRA/waste-carriers-engine/pull/1134) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Add reference to letters to aid understanding returns [\#1133](https://github.com/DEFRA/waste-carriers-engine/pull/1133) ([tobyprivett](https://github.com/tobyprivett))
 - Reject Companies House data [\#1132](https://github.com/DEFRA/waste-carriers-engine/pull/1132) ([Beckyrose200](https://github.com/Beckyrose200))
-- Adjust spelling of dependentThoroughfare to match OS Places API [\#1131](https://github.com/DEFRA/waste-carriers-engine/pull/1131) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Adjust spelling of dependentThoroughfare to match OS Places API [\#1131](https://github.com/DEFRA/waste-carriers-engine/pull/1131) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Add `registered_company_name` to the registration search terms [\#1130](https://github.com/DEFRA/waste-carriers-engine/pull/1130) ([tobyprivett](https://github.com/tobyprivett))
-- Make sole trader business name optional [\#1129](https://github.com/DEFRA/waste-carriers-engine/pull/1129) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Make sole trader business name optional [\#1129](https://github.com/DEFRA/waste-carriers-engine/pull/1129) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Displaying registered company name and address [\#1128](https://github.com/DEFRA/waste-carriers-engine/pull/1128) ([Beckyrose200](https://github.com/Beckyrose200))
-- Extend 'trading as' logic in presentation name to upper-tier sole traders [\#1126](https://github.com/DEFRA/waste-carriers-engine/pull/1126) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Extend 'trading as' logic in presentation name to upper-tier sole traders [\#1126](https://github.com/DEFRA/waste-carriers-engine/pull/1126) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Enable `active_registration` for an OrderItemLog [\#1111](https://github.com/DEFRA/waste-carriers-engine/pull/1111) ([tobyprivett](https://github.com/tobyprivett))
 - Copy card improvements - stop non card payment ad-hoc card orders [\#1109](https://github.com/DEFRA/waste-carriers-engine/pull/1109) ([tobyprivett](https://github.com/tobyprivett))
-- Feature/log mid reg card orders [\#1102](https://github.com/DEFRA/waste-carriers-engine/pull/1102) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Feature/log mid reg card orders [\#1102](https://github.com/DEFRA/waste-carriers-engine/pull/1102) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Privacy notice update webpage title [\#1101](https://github.com/DEFRA/waste-carriers-engine/pull/1101) ([tobyprivett](https://github.com/tobyprivett))
-- Feature/log mid reg card orders [\#1100](https://github.com/DEFRA/waste-carriers-engine/pull/1100) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Genericise text for permissions error page [\#1096](https://github.com/DEFRA/waste-carriers-engine/pull/1096) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Feature/log mid reg card orders [\#1100](https://github.com/DEFRA/waste-carriers-engine/pull/1100) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Genericise text for permissions error page [\#1096](https://github.com/DEFRA/waste-carriers-engine/pull/1096) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Update privacy policy and 'last updated' [\#1095](https://github.com/DEFRA/waste-carriers-engine/pull/1095) ([tobyprivett](https://github.com/tobyprivett))
 - Update privacy notice to include Notify text [\#1094](https://github.com/DEFRA/waste-carriers-engine/pull/1094) ([tobyprivett](https://github.com/tobyprivett))
-- Feature/order items log [\#1093](https://github.com/DEFRA/waste-carriers-engine/pull/1093) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Feature/order items log [\#1093](https://github.com/DEFRA/waste-carriers-engine/pull/1093) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - 'Error' showing in company's address and address of director [\#1089](https://github.com/DEFRA/waste-carriers-engine/pull/1089) ([Beckyrose200](https://github.com/Beckyrose200))
 - Adding 'Error' in the page title when an error is generated [\#1088](https://github.com/DEFRA/waste-carriers-engine/pull/1088) ([Beckyrose200](https://github.com/Beckyrose200))
 - Feature/page title match h1 [\#1086](https://github.com/DEFRA/waste-carriers-engine/pull/1086) ([Beckyrose200](https://github.com/Beckyrose200))
@@ -441,82 +443,89 @@
 
 **Fixed bugs:**
 
-- Fix/ruby 3145 refunds i18n [\#1561](https://github.com/DEFRA/waste-carriers-engine/pull/1561) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix/ruby 3145 missing refund update logic [\#1558](https://github.com/DEFRA/waste-carriers-engine/pull/1558) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Chore/ruby 3409 mongoid reference one [\#1582](https://github.com/DEFRA/waste-carriers-engine/pull/1582) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- RUBY 3387 implement solution to govpay status being stored twice [\#1581](https://github.com/DEFRA/waste-carriers-engine/pull/1581) ([jjromeo](https://github.com/jjromeo))
+- Revert address area change to not update area attribute [\#1575](https://github.com/DEFRA/waste-carriers-engine/pull/1575) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- RUBY 3387 implement solution to govpay status being stored twice [\#1571](https://github.com/DEFRA/waste-carriers-engine/pull/1571) ([jjromeo](https://github.com/jjromeo))
+- \[RUBY-3394\] Fix case sensitivity and typo in Govpay webhook handling [\#1568](https://github.com/DEFRA/waste-carriers-engine/pull/1568) ([jjromeo](https://github.com/jjromeo))
+- Fix/ruby 3330 duplicate text [\#1567](https://github.com/DEFRA/waste-carriers-engine/pull/1567) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/ruby 3330 duplicate text [\#1565](https://github.com/DEFRA/waste-carriers-engine/pull/1565) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/ruby 3145 refunds i18n [\#1561](https://github.com/DEFRA/waste-carriers-engine/pull/1561) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/ruby 3145 missing refund update logic [\#1558](https://github.com/DEFRA/waste-carriers-engine/pull/1558) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - \[RUBY-3079\] Add communication\_records to RenewingRegistration and refactor email service specs [\#1531](https://github.com/DEFRA/waste-carriers-engine/pull/1531) ([jjromeo](https://github.com/jjromeo))
-- fix/RUBY-2973\_reinstate\_copy\_methods [\#1529](https://github.com/DEFRA/waste-carriers-engine/pull/1529) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Feature/ruby 2973 unsubscribe [\#1527](https://github.com/DEFRA/waste-carriers-engine/pull/1527) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Feature/ruby 2973 unsubscribe [\#1526](https://github.com/DEFRA/waste-carriers-engine/pull/1526) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Feature/ruby 2973 unsubscribe [\#1525](https://github.com/DEFRA/waste-carriers-engine/pull/1525) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Feature/ruby 2973 unsubscribe [\#1524](https://github.com/DEFRA/waste-carriers-engine/pull/1524) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Feature/ruby 2973 unsubscribe [\#1522](https://github.com/DEFRA/waste-carriers-engine/pull/1522) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Feature/ruby 2973 unsubscribe [\#1521](https://github.com/DEFRA/waste-carriers-engine/pull/1521) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix/ruby 2975 govpay callback uuids [\#1515](https://github.com/DEFRA/waste-carriers-engine/pull/1515) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- fix/RUBY-2860\_conviction\_signoff [\#1514](https://github.com/DEFRA/waste-carriers-engine/pull/1514) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix/ruby 2860 conviction search results [\#1508](https://github.com/DEFRA/waste-carriers-engine/pull/1508) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix/ruby 2860 missing registration attributes [\#1505](https://github.com/DEFRA/waste-carriers-engine/pull/1505) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- fix/RUBY-2973\_reinstate\_copy\_methods [\#1529](https://github.com/DEFRA/waste-carriers-engine/pull/1529) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Feature/ruby 2973 unsubscribe [\#1527](https://github.com/DEFRA/waste-carriers-engine/pull/1527) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Feature/ruby 2973 unsubscribe [\#1526](https://github.com/DEFRA/waste-carriers-engine/pull/1526) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Feature/ruby 2973 unsubscribe [\#1525](https://github.com/DEFRA/waste-carriers-engine/pull/1525) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Feature/ruby 2973 unsubscribe [\#1524](https://github.com/DEFRA/waste-carriers-engine/pull/1524) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Feature/ruby 2973 unsubscribe [\#1522](https://github.com/DEFRA/waste-carriers-engine/pull/1522) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Feature/ruby 2973 unsubscribe [\#1521](https://github.com/DEFRA/waste-carriers-engine/pull/1521) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/ruby 2975 govpay callback uuids [\#1515](https://github.com/DEFRA/waste-carriers-engine/pull/1515) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- fix/RUBY-2860\_conviction\_signoff [\#1514](https://github.com/DEFRA/waste-carriers-engine/pull/1514) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/ruby 2860 conviction search results [\#1508](https://github.com/DEFRA/waste-carriers-engine/pull/1508) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/ruby 2860 missing registration attributes [\#1505](https://github.com/DEFRA/waste-carriers-engine/pull/1505) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - \[RUBY-2845\] Refactor certificate token generation and update services [\#1502](https://github.com/DEFRA/waste-carriers-engine/pull/1502) ([jjromeo](https://github.com/jjromeo))
 - Ruby 2802 wcr accessibility replace pdf certificate with html version [\#1500](https://github.com/DEFRA/waste-carriers-engine/pull/1500) ([jjromeo](https://github.com/jjromeo))
 - Ruby 2845 wcr handle expired certificate link [\#1498](https://github.com/DEFRA/waste-carriers-engine/pull/1498) ([jjromeo](https://github.com/jjromeo))
-- Revert 'Outside England' / 'Not found' change [\#1497](https://github.com/DEFRA/waste-carriers-engine/pull/1497) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Revert 'Outside England' / 'Not found' change [\#1497](https://github.com/DEFRA/waste-carriers-engine/pull/1497) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - \[RUBY-2845\] Fix issues with view certificate link [\#1496](https://github.com/DEFRA/waste-carriers-engine/pull/1496) ([jjromeo](https://github.com/jjromeo))
 - \[RUBY-2842\] refactoring original\_activation\_date method to handle situation when dateActivated is missing [\#1492](https://github.com/DEFRA/waste-carriers-engine/pull/1492) ([brujeo](https://github.com/brujeo))
-- Fix/ruby 2805 postcode validation [\#1487](https://github.com/DEFRA/waste-carriers-engine/pull/1487) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Fix/ruby 2805 postcode validation [\#1487](https://github.com/DEFRA/waste-carriers-engine/pull/1487) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Fix/ruby 2800 wcr fo missing template 404 errors [\#1480](https://github.com/DEFRA/waste-carriers-engine/pull/1480) ([brujeo](https://github.com/brujeo))
 - adding valid target for aria-labelledby attribute [\#1478](https://github.com/DEFRA/waste-carriers-engine/pull/1478) ([brujeo](https://github.com/brujeo))
-- fix/RUBY-2762\_legacy\_account\_email\_values [\#1475](https://github.com/DEFRA/waste-carriers-engine/pull/1475) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix/ruby 2793 defra ruby govpay config [\#1466](https://github.com/DEFRA/waste-carriers-engine/pull/1466) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- fix/RUBY-2762\_legacy\_account\_email\_values [\#1475](https://github.com/DEFRA/waste-carriers-engine/pull/1475) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/ruby 2793 defra ruby govpay config [\#1466](https://github.com/DEFRA/waste-carriers-engine/pull/1466) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Ruby 2378 wcr renewals overseas company can not renew due to non uk company number [\#1455](https://github.com/DEFRA/waste-carriers-engine/pull/1455) ([brujeo](https://github.com/brujeo))
-- Allow wicked\_pdf to use local file storage [\#1443](https://github.com/DEFRA/waste-carriers-engine/pull/1443) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Allow wicked\_pdf to use local file storage [\#1443](https://github.com/DEFRA/waste-carriers-engine/pull/1443) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - re-add payment method and get version of defra-ruby-govpay with re-added objects [\#1442](https://github.com/DEFRA/waste-carriers-engine/pull/1442) ([jjromeo](https://github.com/jjromeo))
 - RUBY-2533: Making use of certificate generator service [\#1439](https://github.com/DEFRA/waste-carriers-engine/pull/1439) ([brujeo](https://github.com/brujeo))
 - fixing an issue with error assigned to wrong property [\#1401](https://github.com/DEFRA/waste-carriers-engine/pull/1401) ([brujeo](https://github.com/brujeo))
-- Add support for govpay refund statuses [\#1371](https://github.com/DEFRA/waste-carriers-engine/pull/1371) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- remove cert date from confirmation emails [\#1366](https://github.com/DEFRA/waste-carriers-engine/pull/1366) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- add cert generation date to PDF certificate [\#1364](https://github.com/DEFRA/waste-carriers-engine/pull/1364) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- add reg\_identifier to deregistration email [\#1346](https://github.com/DEFRA/waste-carriers-engine/pull/1346) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Exclude dereg attributes from attribute copying [\#1343](https://github.com/DEFRA/waste-carriers-engine/pull/1343) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix/dereg token copy error [\#1342](https://github.com/DEFRA/waste-carriers-engine/pull/1342) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- edit registration copy error [\#1341](https://github.com/DEFRA/waste-carriers-engine/pull/1341) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Missed card payment type [\#1335](https://github.com/DEFRA/waste-carriers-engine/pull/1335) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix moto payment checking [\#1332](https://github.com/DEFRA/waste-carriers-engine/pull/1332) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Govpay refunds [\#1331](https://github.com/DEFRA/waste-carriers-engine/pull/1331) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix deregistration confirmation html [\#1326](https://github.com/DEFRA/waste-carriers-engine/pull/1326) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Use reg\_identifier instead of token when redirecting [\#1325](https://github.com/DEFRA/waste-carriers-engine/pull/1325) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- transient registration addresses [\#1317](https://github.com/DEFRA/waste-carriers-engine/pull/1317) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix govpay 400 error [\#1315](https://github.com/DEFRA/waste-carriers-engine/pull/1315) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Govpay refunds error logging [\#1288](https://github.com/DEFRA/waste-carriers-engine/pull/1288) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Govpay error debug logging [\#1284](https://github.com/DEFRA/waste-carriers-engine/pull/1284) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Overseas company numbers [\#1282](https://github.com/DEFRA/waste-carriers-engine/pull/1282) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Revert "EPR pending convictions check" [\#1279](https://github.com/DEFRA/waste-carriers-engine/pull/1279) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- strip contact email whitespace [\#1277](https://github.com/DEFRA/waste-carriers-engine/pull/1277) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Reinstate address\_line\_N naming convention [\#1274](https://github.com/DEFRA/waste-carriers-engine/pull/1274) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Do not log valid but unsuccessful payments unless there is an error [\#1271](https://github.com/DEFRA/waste-carriers-engine/pull/1271) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix international phone number format searches [\#1265](https://github.com/DEFRA/waste-carriers-engine/pull/1265) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix/blank contact email [\#1246](https://github.com/DEFRA/waste-carriers-engine/pull/1246) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Drop minimum people validation [\#1226](https://github.com/DEFRA/waste-carriers-engine/pull/1226) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- No error on continue for blank people page [\#1218](https://github.com/DEFRA/waste-carriers-engine/pull/1218) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Main people form validation fixes [\#1216](https://github.com/DEFRA/waste-carriers-engine/pull/1216) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Main people and conviction details form validation [\#1215](https://github.com/DEFRA/waste-carriers-engine/pull/1215) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Handle temp\_reuse\_registered\_address in renewal completion service [\#1214](https://github.com/DEFRA/waste-carriers-engine/pull/1214) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Adjust company name hint text for lower-tier sole trader [\#1207](https://github.com/DEFRA/waste-carriers-engine/pull/1207) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Prevent changing from partnership to LLP [\#1206](https://github.com/DEFRA/waste-carriers-engine/pull/1206) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix/use trading name mandatory [\#1197](https://github.com/DEFRA/waste-carriers-engine/pull/1197) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix navigation where company name is mandatory [\#1196](https://github.com/DEFRA/waste-carriers-engine/pull/1196) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Skip duplicated steps on back navigation [\#1195](https://github.com/DEFRA/waste-carriers-engine/pull/1195) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Reinstate temp\_tier\_check attribute skip [\#1190](https://github.com/DEFRA/waste-carriers-engine/pull/1190) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Remove companies house number validation from check answers form [\#1189](https://github.com/DEFRA/waste-carriers-engine/pull/1189) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Zero-left-pad short companies house numbers [\#1188](https://github.com/DEFRA/waste-carriers-engine/pull/1188) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Fix back navigation from main\_people form for companies [\#1179](https://github.com/DEFRA/waste-carriers-engine/pull/1179) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Reset company attributes for non-company business types [\#1165](https://github.com/DEFRA/waste-carriers-engine/pull/1165) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Reset company-specific attributes when business type form is submitted [\#1162](https://github.com/DEFRA/waste-carriers-engine/pull/1162) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Set worldpay\_url in Rails.configuration for specs involving worldpay\_service [\#1156](https://github.com/DEFRA/waste-carriers-engine/pull/1156) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Do not pre-populate company name form for upper-tier companies and sole traders [\#1152](https://github.com/DEFRA/waste-carriers-engine/pull/1152) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Add support for govpay refund statuses [\#1371](https://github.com/DEFRA/waste-carriers-engine/pull/1371) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- remove cert date from confirmation emails [\#1366](https://github.com/DEFRA/waste-carriers-engine/pull/1366) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- add cert generation date to PDF certificate [\#1364](https://github.com/DEFRA/waste-carriers-engine/pull/1364) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- add reg\_identifier to deregistration email [\#1346](https://github.com/DEFRA/waste-carriers-engine/pull/1346) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Exclude dereg attributes from attribute copying [\#1343](https://github.com/DEFRA/waste-carriers-engine/pull/1343) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/dereg token copy error [\#1342](https://github.com/DEFRA/waste-carriers-engine/pull/1342) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- edit registration copy error [\#1341](https://github.com/DEFRA/waste-carriers-engine/pull/1341) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Missed card payment type [\#1335](https://github.com/DEFRA/waste-carriers-engine/pull/1335) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix moto payment checking [\#1332](https://github.com/DEFRA/waste-carriers-engine/pull/1332) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Govpay refunds [\#1331](https://github.com/DEFRA/waste-carriers-engine/pull/1331) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix deregistration confirmation html [\#1326](https://github.com/DEFRA/waste-carriers-engine/pull/1326) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Use reg\_identifier instead of token when redirecting [\#1325](https://github.com/DEFRA/waste-carriers-engine/pull/1325) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- transient registration addresses [\#1317](https://github.com/DEFRA/waste-carriers-engine/pull/1317) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix govpay 400 error [\#1315](https://github.com/DEFRA/waste-carriers-engine/pull/1315) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Govpay refunds error logging [\#1288](https://github.com/DEFRA/waste-carriers-engine/pull/1288) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Govpay error debug logging [\#1284](https://github.com/DEFRA/waste-carriers-engine/pull/1284) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Overseas company numbers [\#1282](https://github.com/DEFRA/waste-carriers-engine/pull/1282) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Revert "EPR pending convictions check" [\#1279](https://github.com/DEFRA/waste-carriers-engine/pull/1279) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- strip contact email whitespace [\#1277](https://github.com/DEFRA/waste-carriers-engine/pull/1277) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Reinstate address\_line\_N naming convention [\#1274](https://github.com/DEFRA/waste-carriers-engine/pull/1274) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Do not log valid but unsuccessful payments unless there is an error [\#1271](https://github.com/DEFRA/waste-carriers-engine/pull/1271) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix international phone number format searches [\#1265](https://github.com/DEFRA/waste-carriers-engine/pull/1265) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/blank contact email [\#1246](https://github.com/DEFRA/waste-carriers-engine/pull/1246) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Drop minimum people validation [\#1226](https://github.com/DEFRA/waste-carriers-engine/pull/1226) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- No error on continue for blank people page [\#1218](https://github.com/DEFRA/waste-carriers-engine/pull/1218) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Main people form validation fixes [\#1216](https://github.com/DEFRA/waste-carriers-engine/pull/1216) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Main people and conviction details form validation [\#1215](https://github.com/DEFRA/waste-carriers-engine/pull/1215) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Handle temp\_reuse\_registered\_address in renewal completion service [\#1214](https://github.com/DEFRA/waste-carriers-engine/pull/1214) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Adjust company name hint text for lower-tier sole trader [\#1207](https://github.com/DEFRA/waste-carriers-engine/pull/1207) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Prevent changing from partnership to LLP [\#1206](https://github.com/DEFRA/waste-carriers-engine/pull/1206) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/use trading name mandatory [\#1197](https://github.com/DEFRA/waste-carriers-engine/pull/1197) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix navigation where company name is mandatory [\#1196](https://github.com/DEFRA/waste-carriers-engine/pull/1196) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Skip duplicated steps on back navigation [\#1195](https://github.com/DEFRA/waste-carriers-engine/pull/1195) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Reinstate temp\_tier\_check attribute skip [\#1190](https://github.com/DEFRA/waste-carriers-engine/pull/1190) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Remove companies house number validation from check answers form [\#1189](https://github.com/DEFRA/waste-carriers-engine/pull/1189) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Zero-left-pad short companies house numbers [\#1188](https://github.com/DEFRA/waste-carriers-engine/pull/1188) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix back navigation from main\_people form for companies [\#1179](https://github.com/DEFRA/waste-carriers-engine/pull/1179) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Reset company attributes for non-company business types [\#1165](https://github.com/DEFRA/waste-carriers-engine/pull/1165) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Reset company-specific attributes when business type form is submitted [\#1162](https://github.com/DEFRA/waste-carriers-engine/pull/1162) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Set worldpay\_url in Rails.configuration for specs involving worldpay\_service [\#1156](https://github.com/DEFRA/waste-carriers-engine/pull/1156) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Do not pre-populate company name form for upper-tier companies and sole traders [\#1152](https://github.com/DEFRA/waste-carriers-engine/pull/1152) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Worldpay integration requires POST instead of GET [\#1151](https://github.com/DEFRA/waste-carriers-engine/pull/1151) ([tobyprivett](https://github.com/tobyprivett))
-- Don't try to save temp attribute at renewal completion [\#1150](https://github.com/DEFRA/waste-carriers-engine/pull/1150) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Don't try to save temp attribute at renewal completion [\#1150](https://github.com/DEFRA/waste-carriers-engine/pull/1150) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - intermittent unit test failure on check\_registered\_company\_name\_form [\#1145](https://github.com/DEFRA/waste-carriers-engine/pull/1145) ([Beckyrose200](https://github.com/Beckyrose200))
 - Handle a blank organisation name in conviction checks [\#1142](https://github.com/DEFRA/waste-carriers-engine/pull/1142) ([tobyprivett](https://github.com/tobyprivett))
-- Exclude temp\_use\_registered\_company\_details attribute [\#1139](https://github.com/DEFRA/waste-carriers-engine/pull/1139) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Exclude temp\_use\_registered\_company\_details attribute [\#1139](https://github.com/DEFRA/waste-carriers-engine/pull/1139) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Pre-fill manual address forms with existing answers on error [\#1049](https://github.com/DEFRA/waste-carriers-engine/pull/1049) ([irisfaraway](https://github.com/irisfaraway))
 - Change example card image [\#1047](https://github.com/DEFRA/waste-carriers-engine/pull/1047) ([irisfaraway](https://github.com/irisfaraway))
 - Add missing \</div\> tags [\#1041](https://github.com/DEFRA/waste-carriers-engine/pull/1041) ([tobyprivett](https://github.com/tobyprivett))
@@ -715,44 +724,51 @@
 
 **Merged pull requests:**
 
+- RUBY-3433:  Tech Debt : remove devise and cancancan gems + remove front-office users from wcr engine [\#1583](https://github.com/DEFRA/waste-carriers-engine/pull/1583) ([brujeo](https://github.com/brujeo))
+- Bump actiontext from 7.0.8.4 to 7.0.8.5 [\#1577](https://github.com/DEFRA/waste-carriers-engine/pull/1577) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump govuk\_design\_system\_formbuilder from 5.6.0 to 5.7.0 [\#1576](https://github.com/DEFRA/waste-carriers-engine/pull/1576) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Chore/ruby 3409 mongoid reference one [\#1574](https://github.com/DEFRA/waste-carriers-engine/pull/1574) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Fix/ruby 3411 missing easting northing [\#1570](https://github.com/DEFRA/waste-carriers-engine/pull/1570) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- \[RUBY-3387\] Remove `govpay_status` field from `Order` model and refactor related methods [\#1566](https://github.com/DEFRA/waste-carriers-engine/pull/1566) ([jjromeo](https://github.com/jjromeo))
+- Update CHANGELOG [\#1563](https://github.com/DEFRA/waste-carriers-engine/pull/1563) ([jjromeo](https://github.com/jjromeo))
 - Bump rexml from 3.3.2 to 3.3.3 [\#1557](https://github.com/DEFRA/waste-carriers-engine/pull/1557) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump rexml from 3.2.8 to 3.3.2 [\#1556](https://github.com/DEFRA/waste-carriers-engine/pull/1556) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Update CHANGELOG [\#1554](https://github.com/DEFRA/waste-carriers-engine/pull/1554) ([jjromeo](https://github.com/jjromeo))
 - Bump govuk\_design\_system\_formbuilder from 5.4.0 to 5.4.1 [\#1553](https://github.com/DEFRA/waste-carriers-engine/pull/1553) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Update CHANGELOG [\#1549](https://github.com/DEFRA/waste-carriers-engine/pull/1549) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Update CHANGELOG [\#1549](https://github.com/DEFRA/waste-carriers-engine/pull/1549) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - \[RUBY-3223\] Update defra\_ruby\_template gem to version 5.4, pinned to major version 5 in Gemfile and Gemfile.lock [\#1548](https://github.com/DEFRA/waste-carriers-engine/pull/1548) ([jjromeo](https://github.com/jjromeo))
 - Bump timecop from 0.9.8 to 0.9.10 [\#1547](https://github.com/DEFRA/waste-carriers-engine/pull/1547) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump actionpack from 7.0.8.3 to 7.0.8.4 [\#1545](https://github.com/DEFRA/waste-carriers-engine/pull/1545) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Update CHANGELOG [\#1543](https://github.com/DEFRA/waste-carriers-engine/pull/1543) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- chore/RUBY-3031\_remove\_rails\_log\_monkey\_patch [\#1542](https://github.com/DEFRA/waste-carriers-engine/pull/1542) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- chore/RUBY-3160\_safe\_copy\_bson [\#1541](https://github.com/DEFRA/waste-carriers-engine/pull/1541) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Update CHANGELOG [\#1543](https://github.com/DEFRA/waste-carriers-engine/pull/1543) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- chore/RUBY-3031\_remove\_rails\_log\_monkey\_patch [\#1542](https://github.com/DEFRA/waste-carriers-engine/pull/1542) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- chore/RUBY-3160\_safe\_copy\_bson [\#1541](https://github.com/DEFRA/waste-carriers-engine/pull/1541) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump rails from 7.0.8.1 to 7.0.8.3 [\#1540](https://github.com/DEFRA/waste-carriers-engine/pull/1540) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump govuk\_design\_system\_formbuilder from 5.3.3 to 5.4.0 [\#1539](https://github.com/DEFRA/waste-carriers-engine/pull/1539) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump rexml from 3.2.6 to 3.2.8 [\#1537](https://github.com/DEFRA/waste-carriers-engine/pull/1537) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Drop unused MISSED\_CARD payment type [\#1536](https://github.com/DEFRA/waste-carriers-engine/pull/1536) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- chore/log\_rotation [\#1534](https://github.com/DEFRA/waste-carriers-engine/pull/1534) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Drop unused MISSED\_CARD payment type [\#1536](https://github.com/DEFRA/waste-carriers-engine/pull/1536) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- chore/log\_rotation [\#1534](https://github.com/DEFRA/waste-carriers-engine/pull/1534) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump govuk\_design\_system\_formbuilder from 5.3.2 to 5.3.3 [\#1532](https://github.com/DEFRA/waste-carriers-engine/pull/1532) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Update CHANGELOG [\#1530](https://github.com/DEFRA/waste-carriers-engine/pull/1530) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Update CHANGELOG [\#1530](https://github.com/DEFRA/waste-carriers-engine/pull/1530) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump devise from 4.9.3 to 4.9.4 [\#1523](https://github.com/DEFRA/waste-carriers-engine/pull/1523) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Feature/ruby 2973 unsubscribe [\#1520](https://github.com/DEFRA/waste-carriers-engine/pull/1520) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Update CHANGELOG [\#1516](https://github.com/DEFRA/waste-carriers-engine/pull/1516) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Feature/ruby 2973 unsubscribe [\#1520](https://github.com/DEFRA/waste-carriers-engine/pull/1520) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Update CHANGELOG [\#1516](https://github.com/DEFRA/waste-carriers-engine/pull/1516) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Update CHANGELOG [\#1513](https://github.com/DEFRA/waste-carriers-engine/pull/1513) ([jjromeo](https://github.com/jjromeo))
 - Bump mongoid from 8.0.7 to 8.0.8 [\#1510](https://github.com/DEFRA/waste-carriers-engine/pull/1510) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Add SafeCopyAttributesService [\#1499](https://github.com/DEFRA/waste-carriers-engine/pull/1499) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Add SafeCopyAttributesService [\#1499](https://github.com/DEFRA/waste-carriers-engine/pull/1499) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Update CHANGELOG [\#1493](https://github.com/DEFRA/waste-carriers-engine/pull/1493) ([brujeo](https://github.com/brujeo))
-- Move analytics services to the back office [\#1490](https://github.com/DEFRA/waste-carriers-engine/pull/1490) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Chore/ruby 2770 move bo functionality to bo [\#1481](https://github.com/DEFRA/waste-carriers-engine/pull/1481) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Move analytics services to the back office [\#1490](https://github.com/DEFRA/waste-carriers-engine/pull/1490) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Chore/ruby 2770 move bo functionality to bo [\#1481](https://github.com/DEFRA/waste-carriers-engine/pull/1481) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - update defra\_ruby\_area dependency [\#1476](https://github.com/DEFRA/waste-carriers-engine/pull/1476) ([brujeo](https://github.com/brujeo))
 - Updating defra\_ruby\_area and other dependencies [\#1474](https://github.com/DEFRA/waste-carriers-engine/pull/1474) ([brujeo](https://github.com/brujeo))
-- Drop use of registration account\_email attribute [\#1473](https://github.com/DEFRA/waste-carriers-engine/pull/1473) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Drop use of registration account\_email attribute [\#1473](https://github.com/DEFRA/waste-carriers-engine/pull/1473) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Update CHANGELOG [\#1467](https://github.com/DEFRA/waste-carriers-engine/pull/1467) ([brujeo](https://github.com/brujeo))
 - Bump defra\_ruby\_govpay from 0.2.3 to 0.2.4 [\#1464](https://github.com/DEFRA/waste-carriers-engine/pull/1464) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Update CHANGELOG [\#1463](https://github.com/DEFRA/waste-carriers-engine/pull/1463) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Align with govpay gem error handling [\#1461](https://github.com/DEFRA/waste-carriers-engine/pull/1461) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Update CHANGELOG [\#1463](https://github.com/DEFRA/waste-carriers-engine/pull/1463) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Align with govpay gem error handling [\#1461](https://github.com/DEFRA/waste-carriers-engine/pull/1461) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump faker from 3.2.1 to 3.2.2 [\#1458](https://github.com/DEFRA/waste-carriers-engine/pull/1458) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Remove mailcatcher / smtp / action\_mailer code and config [\#1457](https://github.com/DEFRA/waste-carriers-engine/pull/1457) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Remove mailcatcher / smtp / action\_mailer code and config [\#1457](https://github.com/DEFRA/waste-carriers-engine/pull/1457) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump mongoid from 8.0.3 to 8.0.7 [\#1454](https://github.com/DEFRA/waste-carriers-engine/pull/1454) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Refactor to remove duplicate upper\_tier definition [\#1453](https://github.com/DEFRA/waste-carriers-engine/pull/1453) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Refactor to remove duplicate upper\_tier definition [\#1453](https://github.com/DEFRA/waste-carriers-engine/pull/1453) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - \[RUBY-2730\] Update govpay to remove excess logging, small code removal [\#1452](https://github.com/DEFRA/waste-carriers-engine/pull/1452) ([jjromeo](https://github.com/jjromeo))
 - Update CHANGELOG [\#1451](https://github.com/DEFRA/waste-carriers-engine/pull/1451) ([brujeo](https://github.com/brujeo))
 - Bump devise from 4.9.2 to 4.9.3 [\#1450](https://github.com/DEFRA/waste-carriers-engine/pull/1450) ([dependabot[bot]](https://github.com/apps/dependabot))
@@ -792,27 +808,27 @@
 - remove downgrade to  os\_map\_ref gem [\#1357](https://github.com/DEFRA/waste-carriers-engine/pull/1357) ([jjromeo](https://github.com/jjromeo))
 - Add code to assign an area to an address through postcode [\#1355](https://github.com/DEFRA/waste-carriers-engine/pull/1355) ([jjromeo](https://github.com/jjromeo))
 - Bump defra\_ruby\_alert from 2.1.1 to 2.2.1 [\#1354](https://github.com/DEFRA/waste-carriers-engine/pull/1354) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Update CHANGELOG [\#1351](https://github.com/DEFRA/waste-carriers-engine/pull/1351) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Update CHANGELOG [\#1351](https://github.com/DEFRA/waste-carriers-engine/pull/1351) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump countries from 5.3.2 to 5.4.0 [\#1350](https://github.com/DEFRA/waste-carriers-engine/pull/1350) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump nokogiri from 1.14.2 to 1.14.3 [\#1348](https://github.com/DEFRA/waste-carriers-engine/pull/1348) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump devise from 4.9.0 to 4.9.2 [\#1347](https://github.com/DEFRA/waste-carriers-engine/pull/1347) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump countries from 5.3.1 to 5.3.2 [\#1344](https://github.com/DEFRA/waste-carriers-engine/pull/1344) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Update CHANGELOG [\#1340](https://github.com/DEFRA/waste-carriers-engine/pull/1340) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Remove redundant Worldpay code [\#1333](https://github.com/DEFRA/waste-carriers-engine/pull/1333) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Update CHANGELOG [\#1340](https://github.com/DEFRA/waste-carriers-engine/pull/1340) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Remove redundant Worldpay code [\#1333](https://github.com/DEFRA/waste-carriers-engine/pull/1333) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump faker from 3.1.0 to 3.1.1 [\#1323](https://github.com/DEFRA/waste-carriers-engine/pull/1323) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump aasm from 5.4.0 to 5.5.0 [\#1322](https://github.com/DEFRA/waste-carriers-engine/pull/1322) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Update CHANGELOG [\#1319](https://github.com/DEFRA/waste-carriers-engine/pull/1319) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Update CHANGELOG [\#1319](https://github.com/DEFRA/waste-carriers-engine/pull/1319) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump nokogiri from 1.14.0 to 1.14.1 [\#1318](https://github.com/DEFRA/waste-carriers-engine/pull/1318) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump countries from 5.3.0 to 5.3.1 [\#1316](https://github.com/DEFRA/waste-carriers-engine/pull/1316) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Remove covid grace window logic, update gems and fix rubocop warnings [\#1305](https://github.com/DEFRA/waste-carriers-engine/pull/1305) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Handle uncaught exceptions [\#1291](https://github.com/DEFRA/waste-carriers-engine/pull/1291) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Allow Errbit env name to be set [\#1290](https://github.com/DEFRA/waste-carriers-engine/pull/1290) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Update CHANGELOG [\#1287](https://github.com/DEFRA/waste-carriers-engine/pull/1287) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Update CHANGELOG [\#1283](https://github.com/DEFRA/waste-carriers-engine/pull/1283) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Remove covid grace window logic, update gems and fix rubocop warnings [\#1305](https://github.com/DEFRA/waste-carriers-engine/pull/1305) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Handle uncaught exceptions [\#1291](https://github.com/DEFRA/waste-carriers-engine/pull/1291) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Allow Errbit env name to be set [\#1290](https://github.com/DEFRA/waste-carriers-engine/pull/1290) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Update CHANGELOG [\#1287](https://github.com/DEFRA/waste-carriers-engine/pull/1287) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Update CHANGELOG [\#1283](https://github.com/DEFRA/waste-carriers-engine/pull/1283) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Use info-level logging for govpay [\#1280](https://github.com/DEFRA/waste-carriers-engine/pull/1280) ([endofunky](https://github.com/endofunky))
-- Adjust NOTIFY\_API\_KEY lookup [\#1273](https://github.com/DEFRA/waste-carriers-engine/pull/1273) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Upgrade to Ruby 3 [\#1272](https://github.com/DEFRA/waste-carriers-engine/pull/1272) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Merge govpay branch into main [\#1270](https://github.com/DEFRA/waste-carriers-engine/pull/1270) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Adjust NOTIFY\_API\_KEY lookup [\#1273](https://github.com/DEFRA/waste-carriers-engine/pull/1273) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Upgrade to Ruby 3 [\#1272](https://github.com/DEFRA/waste-carriers-engine/pull/1272) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Merge govpay branch into main [\#1270](https://github.com/DEFRA/waste-carriers-engine/pull/1270) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump spring from 4.0.0 to 4.1.0 [\#1269](https://github.com/DEFRA/waste-carriers-engine/pull/1269) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump rails from 6.1.6.1 to 6.1.7 [\#1264](https://github.com/DEFRA/waste-carriers-engine/pull/1264) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump faker from 2.22.0 to 2.23.0 [\#1261](https://github.com/DEFRA/waste-carriers-engine/pull/1261) ([dependabot[bot]](https://github.com/apps/dependabot))
@@ -821,7 +837,7 @@
 - Bump govuk\_design\_system\_formbuilder from 3.1.1 to 3.1.2 [\#1255](https://github.com/DEFRA/waste-carriers-engine/pull/1255) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump countries from 5.1.1 to 5.1.2 [\#1252](https://github.com/DEFRA/waste-carriers-engine/pull/1252) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump webmock from 3.17.0 to 3.17.1 [\#1250](https://github.com/DEFRA/waste-carriers-engine/pull/1250) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Production debug logging [\#1249](https://github.com/DEFRA/waste-carriers-engine/pull/1249) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Production debug logging [\#1249](https://github.com/DEFRA/waste-carriers-engine/pull/1249) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump webmock from 3.16.0 to 3.17.0 [\#1247](https://github.com/DEFRA/waste-carriers-engine/pull/1247) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump webmock from 3.14.0 to 3.16.0 [\#1244](https://github.com/DEFRA/waste-carriers-engine/pull/1244) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump faker from 2.21.0 to 2.22.0 [\#1241](https://github.com/DEFRA/waste-carriers-engine/pull/1241) ([dependabot[bot]](https://github.com/apps/dependabot))
@@ -837,19 +853,19 @@
 - Bump govuk\_design\_system\_formbuilder from 3.0.3 to 3.1.0 [\#1212](https://github.com/DEFRA/waste-carriers-engine/pull/1212) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump countries from 5.0.2 to 5.1.0 [\#1210](https://github.com/DEFRA/waste-carriers-engine/pull/1210) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump uk\_postcode from 2.1.7 to 2.1.8 [\#1204](https://github.com/DEFRA/waste-carriers-engine/pull/1204) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Revert "Refactor callback service and controller" [\#1202](https://github.com/DEFRA/waste-carriers-engine/pull/1202) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
-- Refactor callback service and controller [\#1201](https://github.com/DEFRA/waste-carriers-engine/pull/1201) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Revert "Refactor callback service and controller" [\#1202](https://github.com/DEFRA/waste-carriers-engine/pull/1202) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+- Refactor callback service and controller [\#1201](https://github.com/DEFRA/waste-carriers-engine/pull/1201) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump rack from 2.2.3 to 2.2.3.1 [\#1193](https://github.com/DEFRA/waste-carriers-engine/pull/1193) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump countries from 5.0.1 to 5.0.2 [\#1192](https://github.com/DEFRA/waste-carriers-engine/pull/1192) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Chore/back nav new [\#1191](https://github.com/DEFRA/waste-carriers-engine/pull/1191) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Chore/back nav new [\#1191](https://github.com/DEFRA/waste-carriers-engine/pull/1191) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump jquery-rails from 4.4.0 to 4.5.0 [\#1187](https://github.com/DEFRA/waste-carriers-engine/pull/1187) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump govuk\_design\_system\_formbuilder from 3.0.2 to 3.0.3 [\#1186](https://github.com/DEFRA/waste-carriers-engine/pull/1186) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump wicked\_pdf from 2.6.2 to 2.6.3 [\#1185](https://github.com/DEFRA/waste-carriers-engine/pull/1185) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Move valid\_world\_pay\_status? method from the Order model to the World… [\#1183](https://github.com/DEFRA/waste-carriers-engine/pull/1183) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Move valid\_world\_pay\_status? method from the Order model to the World… [\#1183](https://github.com/DEFRA/waste-carriers-engine/pull/1183) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump faker from 2.20.0 to 2.21.0 [\#1182](https://github.com/DEFRA/waste-carriers-engine/pull/1182) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump rails from 6.1.5.1 to 6.1.6 [\#1181](https://github.com/DEFRA/waste-carriers-engine/pull/1181) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump nokogiri from 1.13.5 to 1.13.6 [\#1180](https://github.com/DEFRA/waste-carriers-engine/pull/1180) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Upgrade rails and wicked\_pdf [\#1178](https://github.com/DEFRA/waste-carriers-engine/pull/1178) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Upgrade rails and wicked\_pdf [\#1178](https://github.com/DEFRA/waste-carriers-engine/pull/1178) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump nokogiri from 1.13.4 to 1.13.5 [\#1177](https://github.com/DEFRA/waste-carriers-engine/pull/1177) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump countries from 5.0.0 to 5.0.1 [\#1173](https://github.com/DEFRA/waste-carriers-engine/pull/1173) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump rails from 6.1.5 to 6.1.5.1 [\#1164](https://github.com/DEFRA/waste-carriers-engine/pull/1164) ([dependabot[bot]](https://github.com/apps/dependabot))
@@ -857,7 +873,7 @@
 - Bump nokogiri from 1.13.3 to 1.13.4 [\#1159](https://github.com/DEFRA/waste-carriers-engine/pull/1159) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump countries from 4.2.2 to 5.0.0 [\#1154](https://github.com/DEFRA/waste-carriers-engine/pull/1154) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump mongoid from 7.3.4 to 7.4.0 [\#1153](https://github.com/DEFRA/waste-carriers-engine/pull/1153) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Merge develop into main [\#1125](https://github.com/DEFRA/waste-carriers-engine/pull/1125) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Merge develop into main [\#1125](https://github.com/DEFRA/waste-carriers-engine/pull/1125) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
 - Bump vcr from 6.0.0 to 6.1.0 [\#1123](https://github.com/DEFRA/waste-carriers-engine/pull/1123) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump rails from 6.1.4.7 to 6.1.5 [\#1122](https://github.com/DEFRA/waste-carriers-engine/pull/1122) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump activestorage from 6.1.4.6 to 6.1.4.7 [\#1120](https://github.com/DEFRA/waste-carriers-engine/pull/1120) ([dependabot[bot]](https://github.com/apps/dependabot))