diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index a87f32d945070c05d1cab7d23eb9396cc1153879..e66caeeb33707e19967a0812a38720da311f9cbd 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -246,7 +246,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
         $savedCustomer = $this->get($customer->getEmail(), $customer->getWebsiteId());
         $this->eventManager->dispatch(
             'customer_save_after_data_object',
-            ['customer_data_object' => $savedCustomer, 'orig_customer_data_object' => $customer]
+            ['customer_data_object' => $savedCustomer, 'orig_customer_data_object' => $prevCustomerData]
         );
         return $savedCustomer;
     }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
index bedd9ff7b842d52db56e2caaf57eafdff1ee493a..61c25641df6cd78995ccf092f3eeac31b03b8b0b 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
@@ -241,6 +241,8 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
                 'save',
             ]);
 
+        $origCustomer = $this->customer;
+
         $this->customer->expects($this->atLeastOnce())
             ->method('__toArray')
             ->willReturn(['default_billing', 'default_shipping']);
@@ -417,7 +419,7 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
             ->method('dispatch')
             ->with(
                 'customer_save_after_data_object',
-                ['customer_data_object' => $this->customer, 'orig_customer_data_object' => $customerAttributesMetaData]
+                ['customer_data_object' => $this->customer, 'orig_customer_data_object' => $origCustomer]
             );
 
         $this->model->save($this->customer);
@@ -475,6 +477,8 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
             ]
         );
 
+        $origCustomer = $this->customer;
+
         $this->customer->expects($this->atLeastOnce())
             ->method('__toArray')
             ->willReturn(['default_billing', 'default_shipping']);
@@ -642,7 +646,7 @@ class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
             ->method('dispatch')
             ->with(
                 'customer_save_after_data_object',
-                ['customer_data_object' => $this->customer, 'orig_customer_data_object' => $customerAttributesMetaData]
+                ['customer_data_object' => $this->customer, 'orig_customer_data_object' => $origCustomer]
             );
 
         $this->model->save($this->customer, $passwordHash);
diff --git a/app/code/Magento/Customer/etc/adminhtml/menu.xml b/app/code/Magento/Customer/etc/adminhtml/menu.xml
index ade53e0630988d2e88f058e6ce44500ea322c8e7..7a1b62b37d395b406e187d96b49d2641dbaba15c 100644
--- a/app/code/Magento/Customer/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/menu.xml
@@ -10,6 +10,6 @@
         <add id="Magento_Customer::customer" title="Customers" translate="title" module="Magento_Customer" sortOrder="30" resource="Magento_Customer::customer"/>
         <add id="Magento_Customer::customer_manage" title="All Customers" translate="title" module="Magento_Customer" sortOrder="10" parent="Magento_Customer::customer" action="customer/index/" resource="Magento_Customer::manage"/>
         <add id="Magento_Customer::customer_online" title="Now Online" translate="title" module="Magento_Customer" sortOrder="30" parent="Magento_Customer::customer" action="customer/online/" resource="Magento_Customer::online"/>
-        <add id="Magento_Customer::customer_group" title="Customer Groups" translate="title" module="Magento_Customer" sortOrder="50" parent="Magento_Backend::other_settings" action="customer/group" resource="Magento_Customer::group"/>
+        <add id="Magento_Customer::customer_group" title="Customer Groups" translate="title" module="Magento_Customer" sortOrder="50" parent="Magento_Customer::customer" action="customer/group" resource="Magento_Customer::group"/>
     </menu>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
index 7d99e1a157173b6aadc15e80b9c6c46cabee6bb9..de6717a3bd4af63061f19ac94189d45c43f39fc7 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerGroupEntityTest.php
@@ -16,7 +16,7 @@ use Magento\Mtf\TestCase\Injectable;
  *
  * Test Flow:
  * 1.Log in to backend as admin user.
- * 2.Navigate to Stores>Other Settings>Customer Groups.
+ * 2.Navigate to Customers > Customer Groups.
  * 3.Start to create new Customer Group.
  * 4.Fill in all data according to data set.
  * 5.Click "Save Customer Group" button.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
index 390a446ef6d63f0d654961f2660d5ec0e549dbb4..7f2b4254dff166a854a25a76016d0ff9c0285f44 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
@@ -18,7 +18,7 @@ use Magento\Customer\Test\Fixture\Customer;
  *  2. Customer is created and assigned to this group.
  * Steps:
  *  1. Log in to backend as admin user.
- *  2. Navigate to Stores > Other Settings > Customer Groups.
+ *  2. Navigate to Customers > Customer Groups.
  *  3. Click on Customer Group from grid.
  *  4. Click on Delete "Customer Group".
  *  5. Confirm in pop-up.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.php
index 0dba9e32b02009af973e8f059b9352a92bebc514..3beaa0915b6e6d8db59d9a7ef93c79a074306937 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.php
@@ -13,7 +13,7 @@ use Magento\Mtf\TestCase\Injectable;
 /**
  * Steps:
  * 1. Login to backend as admin user.
- * 2. Navigate to Stores > Other Settings > Customer Groups.
+ * 2. Navigate to Customers > Customer Groups.
  * 3. Select system Customer Group specified in data set from grid.
  * 4. Perform all assertions.
  *
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml
index e26f3a999eb48fec7f9a129f566793601d6ed2c8..404e62dcad6485e6b38af38cfca4eb7a7d10dd3d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/NavigateMenuTest.xml
@@ -18,7 +18,7 @@
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
         <variation name="NavigateMenuTest24">
-            <data name="menuItem" xsi:type="string">Stores > Customer Groups</data>
+            <data name="menuItem" xsi:type="string">Customers > Customer Groups</data>
             <data name="pageTitle" xsi:type="string">Customer Groups</data>
             <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
         </variation>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
index badebdec63ea69dd08313035dc802076d083a702..aa50235cb4a10da6d657bfea6bacdf647aa875f9 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerGroupEntityTest.php
@@ -19,7 +19,7 @@ use Magento\Mtf\TestCase\Injectable;
  * 1. Customer Group is created
  * Steps:
  * 1. Log in to backend as admin user
- * 2. Navigate to Stores > Other Settings > Customer Groups
+ * 2. Navigate to Customers > Customer Groups
  * 3. Click on Customer Group from grid
  * 4. Update data according to data set
  * 5. Click "Save Customer Group" button
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.php
index 902b4b7f9ae15e4268acb5d6341004fc9a64b6b7..bc8392763edd22b33a586ed510f0679140fefc8d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.php
@@ -13,7 +13,7 @@ use Magento\Mtf\TestCase\Injectable;
 /**
  * Steps:
  * 1. Login to backend as admin user.
- * 2. Navigate to Stores > Other Settings > Customer Groups.
+ * 2. Navigate to Customers > Customer Groups.
  * 3. Select system Customer Group specified in data set from grid.
  * 4. Perform all assertions.
  *