diff --git a/src/components/modal/v2/parts/Calculator.jsx b/src/components/modal/v2/parts/Calculator.jsx
index 2d4daa5a6c..c88106a24b 100644
--- a/src/components/modal/v2/parts/Calculator.jsx
+++ b/src/components/modal/v2/parts/Calculator.jsx
@@ -151,7 +151,7 @@ const Calculator = ({ setExpandedState, calculator, aprDisclaimer }) => {
                     }`}
                 >
                     <div>
-                        {error ? <Icon name="warning" /> : null}
+                        {error && hasUsedInputField ? <Icon name="warning" /> : null}
                         <div>{error}</div>
                     </div>
                 </div>
diff --git a/src/components/modal/v2/styles/components/_header.scss b/src/components/modal/v2/styles/components/_header.scss
index ad11f4c4df..8d2a7aa20c 100644
--- a/src/components/modal/v2/styles/components/_header.scss
+++ b/src/components/modal/v2/styles/components/_header.scss
@@ -126,6 +126,10 @@
                         transform: translate(0, 0);
                     }
                 }
+
+                .pp-logo {
+                    pointer-events: none;
+                }
             }
         }
 
@@ -158,6 +162,7 @@
             svg {
                 height: 48px;
                 width: 48px;
+                pointer-events: none;
 
                 @include desktop {
                     margin: 0px;
@@ -190,6 +195,7 @@
             position: absolute;
             right: 0;
             bottom: 36px;
+            pointer-events: none;
 
             @include desktop {
                 &.background-mobile {
diff --git a/src/library/zoid/message/validation.js b/src/library/zoid/message/validation.js
index ca14d3668a..75da6fc2b5 100644
--- a/src/library/zoid/message/validation.js
+++ b/src/library/zoid/message/validation.js
@@ -70,13 +70,14 @@ export default {
         if (typeof merchantId !== 'undefined') {
             if (!validateType(Types.STRING, merchantId)) {
                 logInvalidType('merchantId', Types.STRING, merchantId);
-            } else if (merchantId.length !== 13 && merchantId.length !== 10) {
-                logInvalid('merchantId', 'Ensure the correct Merchant ID has been entered.');
             } else {
+                const isInvalid = merchantId.split(',').some(id => id.length !== 13 && id.length !== 10);
+                if (isInvalid) {
+                    logInvalid('merchantId', 'Ensure the correct Merchant ID has been entered.');
+                }
                 return merchantId;
             }
         }
-
         return undefined;
     },
     customerId: ({ props: { customerId } }) => {
diff --git a/src/utils/sdk.js b/src/utils/sdk.js
index 4f61b49cfd..c7b9c91f63 100644
--- a/src/utils/sdk.js
+++ b/src/utils/sdk.js
@@ -55,7 +55,7 @@ export function getMerchantConfig() {
 export function getAccount() {
     if (__MESSAGES__.__TARGET__ === 'SDK') {
         // TODO: Should we pass both up if they exist so that nodeweb can create a partner context?
-        return getMerchantID()[0] || `client-id:${getClientID()}`;
+        return getMerchantID().join(',') || `client-id:${getClientID()}`;
     } else {
         return undefined;
     }
diff --git a/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_LONG_TERM/desktop/0-Amounts_below_99_show_correct_below_threshold_warning-desktop-snap.png b/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_LONG_TERM/desktop/0-Amounts_below_99_show_correct_below_threshold_warning-desktop-snap.png
index 8180d7788a..d25706b814 100644
Binary files a/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_LONG_TERM/desktop/0-Amounts_below_99_show_correct_below_threshold_warning-desktop-snap.png and b/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_LONG_TERM/desktop/0-Amounts_below_99_show_correct_below_threshold_warning-desktop-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png
index 4dc34cc3ea..6ad84fcb6c 100644
Binary files a/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png
index 91a83ad039..62cfe19630 100644
Binary files a/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png b/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png
index 448e912c48..8451a2db03 100644
Binary files a/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png and b/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png b/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png
index 3aace2c937..6b8475e20f 100644
Binary files a/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png and b/tests/functional/v2/snapshots/modal/api/DE/DEV_DE_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/desktop/0-Amounts_below_199_show_correct_below_threshold_warning-desktop-snap.png b/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/desktop/0-Amounts_below_199_show_correct_below_threshold_warning-desktop-snap.png
index 5f9fb45c08..8782cdb9d7 100644
Binary files a/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/desktop/0-Amounts_below_199_show_correct_below_threshold_warning-desktop-snap.png and b/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/desktop/0-Amounts_below_199_show_correct_below_threshold_warning-desktop-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/desktop/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-desktop-snap.png b/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/desktop/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-desktop-snap.png
index c980977d64..9cdadd9d29 100644
Binary files a/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/desktop/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-desktop-snap.png and b/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/desktop/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-desktop-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png
index 2c60866bf8..544d6f6985 100644
Binary files a/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png
index d7ab55d2e4..aac11c96aa 100644
Binary files a/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/api/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/api/US/DEV_US_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png b/tests/functional/v2/snapshots/modal/api/US/DEV_US_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png
index d13afda29c..33c624dc60 100644
Binary files a/tests/functional/v2/snapshots/modal/api/US/DEV_US_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png and b/tests/functional/v2/snapshots/modal/api/US/DEV_US_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/api/US/DEV_US_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png b/tests/functional/v2/snapshots/modal/api/US/DEV_US_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png
index 4852096d57..2d213c7f9c 100644
Binary files a/tests/functional/v2/snapshots/modal/api/US/DEV_US_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png and b/tests/functional/v2/snapshots/modal/api/US/DEV_US_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/sdk/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/sdk/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png
index da6cd64e9a..96921484a9 100644
Binary files a/tests/functional/v2/snapshots/modal/sdk/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/sdk/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/sdk/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/sdk/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png
index 187dea1882..2bedfa0c8f 100644
Binary files a/tests/functional/v2/snapshots/modal/sdk/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/sdk/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/sdk/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/sdk/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png
index cdd723de80..a1394a759a 100644
Binary files a/tests/functional/v2/snapshots/modal/sdk/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/sdk/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/sdk/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/sdk/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png
index 3fade47376..57fe522e15 100644
Binary files a/tests/functional/v2/snapshots/modal/sdk/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/sdk/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/standalone/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/standalone/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png
index da6cd64e9a..96921484a9 100644
Binary files a/tests/functional/v2/snapshots/modal/standalone/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/standalone/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/standalone/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/standalone/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png
index 187dea1882..2bedfa0c8f 100644
Binary files a/tests/functional/v2/snapshots/modal/standalone/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/standalone/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/standalone/DE/DEV_DE_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png b/tests/functional/v2/snapshots/modal/standalone/DE/DEV_DE_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png
index e52f9b1fcf..ba1aaab229 100644
Binary files a/tests/functional/v2/snapshots/modal/standalone/DE/DEV_DE_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png and b/tests/functional/v2/snapshots/modal/standalone/DE/DEV_DE_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/standalone/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/standalone/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png
index cdd723de80..a1394a759a 100644
Binary files a/tests/functional/v2/snapshots/modal/standalone/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/standalone/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/standalone/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/standalone/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png
index 3fade47376..57fe522e15 100644
Binary files a/tests/functional/v2/snapshots/modal/standalone/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/standalone/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/standalone/US/DEV_US_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png b/tests/functional/v2/snapshots/modal/standalone/US/DEV_US_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png
index 0ae212c859..1be7052634 100644
Binary files a/tests/functional/v2/snapshots/modal/standalone/US/DEV_US_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png and b/tests/functional/v2/snapshots/modal/standalone/US/DEV_US_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/desktop/0-Amounts_below_99_show_correct_below_threshold_warning-desktop-snap.png b/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/desktop/0-Amounts_below_99_show_correct_below_threshold_warning-desktop-snap.png
index 1042eb3611..998e9289c2 100644
Binary files a/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/desktop/0-Amounts_below_99_show_correct_below_threshold_warning-desktop-snap.png and b/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/desktop/0-Amounts_below_99_show_correct_below_threshold_warning-desktop-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/desktop/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-desktop-snap.png b/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/desktop/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-desktop-snap.png
index 0d5674e766..605b91d655 100644
Binary files a/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/desktop/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-desktop-snap.png and b/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/desktop/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-desktop-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png
index 11e746da5d..4eb073c0fa 100644
Binary files a/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/mobile/0-Amounts_below_99_show_correct_below_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png
index 93d792d1c5..715ea6fb07 100644
Binary files a/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_LONG_TERM/mobile/5000.01-Amounts_above_5000_show_correct_above_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png b/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png
index 0eb4ea6d37..c073d54843 100644
Binary files a/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png and b/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png b/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png
index 7f1761f104..9a1360f695 100644
Binary files a/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png and b/tests/functional/v2/snapshots/modal/webpage/DE/DEV_DE_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/desktop/0-Amounts_below_199_show_correct_below_threshold_warning-desktop-snap.png b/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/desktop/0-Amounts_below_199_show_correct_below_threshold_warning-desktop-snap.png
index ff2ad10150..cf55226fb6 100644
Binary files a/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/desktop/0-Amounts_below_199_show_correct_below_threshold_warning-desktop-snap.png and b/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/desktop/0-Amounts_below_199_show_correct_below_threshold_warning-desktop-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/desktop/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-desktop-snap.png b/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/desktop/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-desktop-snap.png
index 3b33e57ed4..4708495ccd 100644
Binary files a/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/desktop/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-desktop-snap.png and b/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/desktop/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-desktop-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png
index d828d4c53c..1e7b016be5 100644
Binary files a/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/mobile/0-Amounts_below_199_show_correct_below_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png b/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png
index 3849147c96..b223794d07 100644
Binary files a/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png and b/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_LONG_TERM/mobile/20000.01-Amounts_above_20000_show_correct_above_threshold_warning-mobile-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png b/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png
index d476b8706c..b702c31ae6 100644
Binary files a/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png and b/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_MULTI/desktop/0-Amount_persists_between_views-desktop-snap.png differ
diff --git a/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png b/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png
index 823900e9a5..f541521c01 100644
Binary files a/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png and b/tests/functional/v2/snapshots/modal/webpage/US/DEV_US_MULTI/mobile/0-Amount_persists_between_views-mobile-snap.png differ
diff --git a/tests/unit/spec/src/zoid/message/validation.test.js b/tests/unit/spec/src/zoid/message/validation.test.js
index 3b711075b8..3c9a3542a5 100644
--- a/tests/unit/spec/src/zoid/message/validation.test.js
+++ b/tests/unit/spec/src/zoid/message/validation.test.js
@@ -56,9 +56,22 @@ describe('validate', () => {
         expect(merchantId).toEqual(merchantId);
         expect(console.warn).not.toHaveBeenCalled();
 
+        merchantId = validate.merchantId({ props: { merchantId: 'DEV00000000NI,DEV00000001NI' } });
+        expect(merchantId).toEqual(merchantId);
+        expect(console.warn).not.toHaveBeenCalled();
+
+        merchantId = validate.merchantId({ props: { merchantId: 'DEV00000000,DEV00000001NI' } });
+
+        expect(merchantId).toEqual(merchantId);
+        expect(console.warn).toHaveBeenCalledTimes(1);
+        expect(console.warn).toHaveBeenLastCalledWith(
+            expect.stringContaining('invalid_option_value'),
+            expect.objectContaining({ location: 'merchantId' })
+        );
+
         merchantId = validate.merchantId({ props: { merchantId: 'client-id:test_client_id' } });
 
-        expect(merchantId).toBeUndefined();
+        expect(merchantId).toEqual(merchantId);
         expect(console.warn).toHaveBeenCalledTimes(1);
         expect(console.warn).toHaveBeenLastCalledWith(
             expect.stringContaining('invalid_option_value'),