diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
index 4b8b1745c16df..bd550ad56b15a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
@@ -46,5 +46,6 @@
         <element name="textFieldAttrRequireMessage" type="text" selector="//input[@name='custom_attributes[{{attribute}}]']/ancestor::div[contains(@class, 'control')]/div/span" parameterized="true" timeout="30"/>
         <element name="textFieldAttribute" type="input" selector="[name*='custom_attributes[{{attribute}}]']" parameterized="true" timeout="30"/>
         <element name="shippingAddressRequiredField" type="text" selector="//div[@id='shipping-new-address-form']//div[contains(@class, 'field _required') and contains(@name, 'shippingAddress.{{fieldName}}')]" parameterized="true" timeout="30"/>
+        <element name="selectedShippingAddressData" type="text" selector=".shipping-address-item.selected-item"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
index 2ec63a6160f6b..484cc0025ae56 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -8,9 +8,15 @@
     <text args="currentBillingAddress().prefix"></text> <text args="currentBillingAddress().firstname"></text>
     <text args="currentBillingAddress().middlename"></text>
     <text args="currentBillingAddress().lastname"></text> <text args="currentBillingAddress().suffix"></text><br/>
+    <if args="currentBillingAddress().company">
+        <text args="currentBillingAddress().company"/><br/>
+    </if>
     <text args="currentBillingAddress().street.join(', ')"></text><br/>
     <text args="currentBillingAddress().city "></text>, <span text="currentBillingAddress().region"></span>
     <text args="currentBillingAddress().postcode"></text><br/>
+    <if args="currentBillingAddress().vatId">
+        <text args="currentBillingAddress().vatId"/><br/>
+    </if>
     <text args="getCountryName(currentBillingAddress().countryId)"></text><br/>
     <a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br/>
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
index e89ec66b7b16d..598b13e9b266d 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -7,8 +7,14 @@
 <div class="shipping-address-item" css="'selected-item' : isSelected() , 'not-selected-item':!isSelected()">
     <text args="address().prefix"></text> <text args="address().firstname"></text> <text args="address().middlename"></text>
     <text args="address().lastname"></text> <text args="address().suffix"></text><br/>
+    <if args="address().company">
+        <text args="address().company"/><br/>
+    </if>
     <text args="_.values(address().street).join(', ')"></text><br/>
     <text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br/>
+    <if args="address().vatId">
+        <text args="address().vatId"/><br/>
+    </if>
     <text args="getCountryName(address().countryId)"></text><br/>
     <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
index 14ef6bac143e7..518def713b459 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
@@ -7,8 +7,14 @@
 <if args="visible()">
     <text args="address().prefix"></text> <text args="address().firstname"></text> <text args="address().middlename"></text>
     <text args="address().lastname"></text> <text args="address().suffix"></text><br/>
+    <if args="address().company">
+        <text args="address().company"/><br/>
+    </if>
     <text args="_.values(address().street).join(', ')"></text><br/>
     <text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br/>
+    <if args="address().vatId">
+        <text args="address().vatId"/><br/>
+    </if>
     <text args="getCountryName(address().countryId)"></text><br/>
     <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/>
 
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml
new file mode 100644
index 0000000000000..0ff7e594c98cb
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCompanyAndVatIdDataAtCheckoutTest.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCompanyAndVatIdDataAtCheckoutTest">
+        <annotations>
+            <features value="Customer"/>
+            <stories value="Check if Company name and VAT Id visible at the checkout"/>
+            <title value="Check if Company name and VAT Id visible at the checkout"/>
+            <description value="Company name and VAT Id should be visible at the checkout step in address if it switched on at configuration"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-40437"/>
+            <group value="customer"/>
+            <group value="create"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set customer/address/taxvat_show opt" stepKey="setShowTaxNumber"/>
+            <createData entity="CustomerEntityOne" stepKey="createCustomer"/>
+            <createData entity="SimpleSubCategory" stepKey="createCategory" />
+            <createData entity="SimpleProduct" stepKey="createProduct" >
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <magentoCLI command="config:set customer/address/taxvat_show 0" stepKey="setShowTaxNumberBack"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
+        </after>
+        <!--Login customer on storefront-->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer">
+            <argument name="Customer" value="$$createCustomer$$" />
+        </actionGroup>
+        <!-- Add product to the cart -->
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="goToProductPage">
+            <argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addProductToCart">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingCheckoutPageWithShippingMethod"/>
+        <!--Check Company and Vat Id data at checkout shipping-->
+        <executeJS function="return document.querySelectorAll('{{CheckoutShippingSection.selectedShippingAddressData}}')[0].innerText;" stepKey="grabShipping"/>
+        <assertStringContainsString stepKey="checkCompanyAtShipping">
+            <expectedResult type="string">{{CustomerAddressSimple.company}}</expectedResult>
+            <actualResult type="variable">grabShipping</actualResult>
+        </assertStringContainsString>
+        <assertStringContainsString stepKey="checkVatIdAtShipping">
+            <expectedResult type="string">{{CustomerAddressSimple.vat_id}}</expectedResult>
+            <actualResult type="variable">grabShipping</actualResult>
+        </assertStringContainsString>
+        <!--Move to 'Review & Payments'-->
+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask1"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
+        <!--Check Company and Vat Id data at checkout 'Review & Payments'-->
+        <executeJS function="return document.querySelectorAll('{{CheckoutPaymentWithDisplayBillingAddressOnPaymentPageSection.billingAddressDetails}}')[0].innerText;" stepKey="grabPaymentMethodInfo"/>
+        <assertStringContainsString stepKey="checkCompanyAtPaymentMethodInfo">
+            <expectedResult type="string">{{CustomerAddressSimple.company}}</expectedResult>
+            <actualResult type="variable">grabPaymentMethodInfo</actualResult>
+        </assertStringContainsString>
+        <assertStringContainsString stepKey="checkVatIdAtPaymentMethodInfo">
+            <expectedResult type="string">{{CustomerAddressSimple.vat_id}}</expectedResult>
+            <actualResult type="variable">grabPaymentMethodInfo</actualResult>
+        </assertStringContainsString>
+        <executeJS function="return document.querySelectorAll('{{CheckoutPaymentSection.shippingInformationSection}}')[0].innerText;" stepKey="grabPaymentShippingTo"/>
+        <assertStringContainsString stepKey="checkCompanyAtShippingTo">
+            <expectedResult type="string">{{CustomerAddressSimple.company}}</expectedResult>
+            <actualResult type="variable">grabPaymentShippingTo</actualResult>
+        </assertStringContainsString>
+        <assertStringContainsString stepKey="checkVatIdAtShippingTo">
+            <expectedResult type="string">{{CustomerAddressSimple.vat_id}}</expectedResult>
+            <actualResult type="variable">grabPaymentShippingTo</actualResult>
+        </assertStringContainsString>
+    </test>
+</tests>