#34505: improve fixes

Author: karyna-t

app/code/Magento/Cms/Model/Block/DataProvider.php

@@ -30,6 +30,8 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
     protected $loadedData;
 
     /**
+     * Constructor
+     *
      * @param string $name
      * @param string $primaryFieldName
      * @param string $requestFieldName

app/code/Magento/Payment/Block/Info/Instructions.php

@@ -26,16 +26,21 @@ class Instructions extends \Magento\Payment\Block\Info
     protected $_template = 'Magento_Payment::info/instructions.phtml';
 
     /**
-     * Get instructions text from order payment
-     * (or from config, if instructions are missed in payment)
+     * Get instructions text from order payment (or from config, if instructions are missed in payment).
      *
      * @return string
      */
     public function getInstructions()
     {
         if ($this->_instructions === null) {
-            $this->_instructions = $this->getInfo()->getAdditionalInformation('instructions')
-                ?: trim($this->getMethod()->getConfigData('instructions') ?? '');
+            $additionalInstructions = $this->getInfo()->getAdditionalInformation('instructions');
+            if ($additionalInstructions) {
+                $this->_instructions = $additionalInstructions;
+                return $this->_instructions;
+            }
+
+            $instructions = $this->getMethod()->getConfigData('instructions');
+            $this->_instructions = $instructions !== null ? trim($instructions) : '';
         }
         return $this->_instructions;
     }