[EngCom] Public Pull Requests - 2.2-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/Config/Model/Config.php

@@ -340,6 +340,7 @@ private function getChangedPaths(
      * @param \Magento\Framework\DB\Transaction $deleteTransaction
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _processGroup(
         $groupId,
@@ -360,6 +361,10 @@ protected function _processGroup(
             // set value for group field entry by fieldname
             // use extra memory
             $fieldsetData = [];
+            foreach ($groupData['fields'] as $fieldId => $fieldData) {
+                $fieldsetData[$fieldId] = $fieldData['value'] ?? null;
+            }
+
             foreach ($groupData['fields'] as $fieldId => $fieldData) {
                 $isReadOnly = $this->settingChecker->isReadOnly(
                     $groupPath . '/' . $fieldId,
@@ -380,7 +385,6 @@ protected function _processGroup(
                 if (!isset($fieldData['value'])) {
                     $fieldData['value'] = null;
                 }
-                $fieldsetData[$fieldId] = $fieldData['value'];
                 $data = [
                     'field' => $fieldId,
                     'groups' => $groups,