From 373d356d63d69a77e1b3f2b525e39892d7280590 Mon Sep 17 00:00:00 2001
From: Iurii Ivashchenko <iivashchenko@magento.com>
Date: Fri, 6 Jan 2017 16:33:18 +0200
Subject: [PATCH 1/9] MAGETWO-62807: Case information block on order details
 page in admin panel

---
 .../adminhtml/templates/order/view/tab/info.phtml   |  4 +++-
 .../Magento_Signifyd/web/css/source/_module.less    | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
index 10fdd078bc145..e90c76944f373 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © 2017 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
@@ -40,6 +40,8 @@
     </div>
 </section>
 
+<?php echo $block->getChildHtml('order_case_info') ?>
+
 <?php echo $block->getGiftOptionsHtml() ?>
 
 <section class="admin__page-section">
diff --git a/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less
new file mode 100644
index 0000000000000..be7fd0f4e14ed
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less
@@ -0,0 +1,13 @@
+// /**
+//  * Copyright © 2017 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Order Case Info
+//  ---------------------------------------------
+
+.order-case-table {
+  &:extend(.abs-order-tables all);
+  &:extend(.abs-order-tbody-border all);
+}

From 1fdae3aaf2bce83cef9954af0703716925700589 Mon Sep 17 00:00:00 2001
From: Volodymyr Kublytskyi <vkublytskyi@magento.com>
Date: Tue, 10 Jan 2017 15:13:57 +0200
Subject: [PATCH 2/9] MAGETWO-63047: Add possibility to fetch raw HTTP request
 data from Magento app request

---
 app/etc/di.xml                                |  2 ++
 .../App/PlainTextRequestInterface.php         | 25 +++++++++++++++++++
 .../Magento/Framework/App/Request/Http.php    |  4 +--
 .../Framework/App/RequestContentInterface.php | 18 +++++++++++++
 4 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/App/PlainTextRequestInterface.php
 create mode 100644 lib/internal/Magento/Framework/App/RequestContentInterface.php

diff --git a/app/etc/di.xml b/app/etc/di.xml
index 1b347574f4b2a..a2cd59149eb31 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -18,6 +18,8 @@
     <preference for="Magento\Framework\Search\Adapter\Mysql\Field\FieldInterface" type="Magento\Framework\Search\Adapter\Mysql\Field\Field"/>
     <preference for="Magento\Framework\Search\Adapter\Aggregation\AggregationResolverInterface" type="Magento\Framework\Search\Adapter\Aggregation\AggregationResolver"/>
     <preference for="Magento\Framework\App\RequestInterface" type="Magento\Framework\App\Request\Http" />
+    <preference for="Magento\Framework\App\PlainTextRequestInterface" type="Magento\Framework\App\Request\Http" />
+    <preference for="Magento\Framework\App\RequestContentInterface" type="Magento\Framework\App\Request\Http" />
     <preference for="Magento\Framework\App\Request\PathInfoProcessorInterface" type="Magento\Store\App\Request\PathInfoProcessor" />
     <preference for="Magento\Framework\App\ResponseInterface" type="Magento\Framework\App\Response\Http" />
     <preference for="Magento\Framework\App\RouterListInterface" type="Magento\Framework\App\RouterList" />
diff --git a/lib/internal/Magento/Framework/App/PlainTextRequestInterface.php b/lib/internal/Magento/Framework/App/PlainTextRequestInterface.php
new file mode 100644
index 0000000000000..e68a979a9003b
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/PlainTextRequestInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App;
+
+/**
+ * Interface provides low-level access to Magento Application Request and represent it as a simple string.
+ * This interface does not define format of the request content.
+ * Clients of this interface must be able to validate syntax of request and parse it.
+ *
+ * To read already parsed request data use \Magento\Framework\App\RequestInterface.
+ *
+ * @api
+ */
+interface PlainTextRequestInterface
+{
+    /**
+     * Returns textual representation of request to Magento.
+     *
+     * @return string
+     */
+    public function getContent();
+}
diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index 84154f7ac98e7..399d7a0b03f47 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\App\Request;
 
-use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\RequestContentInterface;
 use Magento\Framework\App\RequestSafetyInterface;
 use Magento\Framework\App\Route\ConfigInterface\Proxy as ConfigInterface;
 use Magento\Framework\HTTP\PhpEnvironment\Request;
@@ -16,7 +16,7 @@
 /**
  * Http request
  */
-class Http extends Request implements RequestInterface, RequestSafetyInterface
+class Http extends Request implements RequestContentInterface, RequestSafetyInterface
 {
     /**#@+
      * HTTP Ports
diff --git a/lib/internal/Magento/Framework/App/RequestContentInterface.php b/lib/internal/Magento/Framework/App/RequestContentInterface.php
new file mode 100644
index 0000000000000..5a788dd83c067
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/RequestContentInterface.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\App;
+
+/**
+ * Interface provides access to parsed request data as well as to the request textual representation.
+ * This interface exists to provide backward compatibility.
+ * Direct usage of RequestInterface and PlainTextRequestInterface is preferable.
+ *
+ * @api
+ */
+interface RequestContentInterface extends RequestInterface, PlainTextRequestInterface
+{
+
+}

From 2dadd7a4ecf003ee66e64fced61ce90db5965041 Mon Sep 17 00:00:00 2001
From: Iurii Ivashchenko <iivashchenko@magento.com>
Date: Wed, 11 Jan 2017 14:05:12 +0200
Subject: [PATCH 3/9] MAGETWO-62807: Case information block on order details
 page in admin panel

- copyrights
---
 .../Sales/view/adminhtml/templates/order/view/tab/info.phtml    | 2 +-
 .../backend/Magento_Signifyd/web/css/source/_module.less        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
index e90c76944f373..560d0a090ad67 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 Magento. All rights reserved.
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less
index be7fd0f4e14ed..7449dce5e2ebb 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less
@@ -1,5 +1,5 @@
 // /**
-//  * Copyright © 2017 Magento. All rights reserved.
+//  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
 //  * See COPYING.txt for license details.
 //  */
 

From b6082dc22454172dfddbf85eae3127b619581cd9 Mon Sep 17 00:00:00 2001
From: Dmytro Yushkin <dyushkin@magento.com>
Date: Fri, 13 Jan 2017 13:10:37 +0200
Subject: [PATCH 4/9] MAGETWO-62807: Case information block on order details
 page in admin panel

- Extension point created for sales order view
---
 .../Block/Adminhtml/Order/View/AdditionalInfo.php  | 14 ++++++++++++++
 .../view/adminhtml/layout/sales_order_view.xml     |  1 +
 .../templates/order/view/additional_info.phtml     |  8 ++++++++
 .../adminhtml/templates/order/view/tab/info.phtml  |  2 +-
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Sales/Block/Adminhtml/Order/View/AdditionalInfo.php
 create mode 100644 app/code/Magento/Sales/view/adminhtml/templates/order/view/additional_info.phtml

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/AdditionalInfo.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/AdditionalInfo.php
new file mode 100644
index 0000000000000..bab52f6ed7601
--- /dev/null
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/AdditionalInfo.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Block\Adminhtml\Order\View;
+
+use Magento\Backend\Block\Template;
+
+class AdditionalInfo extends Template
+{
+
+}
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
index 28d8fee45cd42..977e5109a12e6 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
@@ -23,6 +23,7 @@
                 <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Info" name="order_tab_info" template="order/view/tab/info.phtml">
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Messages" name="order_messages"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
+                    <block class="Magento\Sales\Block\Adminhtml\Order\View\AdditionalInfo" name="order_additional_info" template="order/view/additional_info.phtml"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Items" name="order_items" template="order/view/items.phtml">
                         <arguments>
                             <argument name="columns" xsi:type="array">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/additional_info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/additional_info.phtml
new file mode 100644
index 0000000000000..98d9ea2bcb726
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/additional_info.phtml
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php /** $block \Magento\Sales\Block\Adminhtml\Order\View\AdditionalInfo */?>
+<?php echo $block->getChildHtml()?>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
index 560d0a090ad67..d086d98af6a63 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
@@ -40,7 +40,7 @@
     </div>
 </section>
 
-<?php echo $block->getChildHtml('order_case_info') ?>
+<?php echo $block->getChildHtml('order_additional_info') ?>
 
 <?php echo $block->getGiftOptionsHtml() ?>
 

From 1dc4a2252c537b3b665fc654a5bd4dacbd9ecbc4 Mon Sep 17 00:00:00 2001
From: Iurii Ivashchenko <iivashchenko@magento.com>
Date: Fri, 13 Jan 2017 18:28:55 +0200
Subject: [PATCH 5/9] MAGETWO-62807: Case information block on order details
 page in admin panel

- refactoring
---
 .../adminhtml/templates/order/view/additional_info.phtml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/additional_info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/additional_info.phtml
index 98d9ea2bcb726..9fb3cae05015f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/additional_info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/additional_info.phtml
@@ -3,6 +3,6 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php /** $block \Magento\Sales\Block\Adminhtml\Order\View\AdditionalInfo */?>
-<?php echo $block->getChildHtml()?>
\ No newline at end of file
+
+/** $block \Magento\Sales\Block\Adminhtml\Order\View\AdditionalInfo */
+echo $block->getChildHtml();

From 76863b25475bf2e676a5f3db6aee92a72c63f6fe Mon Sep 17 00:00:00 2001
From: Ievgen Sentiabov <isentiabov@magento.com>
Date: Mon, 16 Jan 2017 18:23:10 +0200
Subject: [PATCH 6/9] MAGETWO-62831: Create Guarantee cancel service

 - Added PUT method to HTTP client
 - Covered guarantee canceling service by unit test
---
 lib/internal/Magento/Framework/HTTP/Adapter/Curl.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
index e2ea747218f60..3a8a432920dc9 100644
--- a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -178,6 +178,9 @@ public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '
             curl_setopt($this->_getResource(), CURLOPT_POSTFIELDS, $body);
         } elseif ($method == \Zend_Http_Client::GET) {
             curl_setopt($this->_getResource(), CURLOPT_HTTPGET, true);
+        } elseif ($method == \Zend_Http_Client::PUT) {
+            curl_setopt($this->_getResource(), CURLOPT_CUSTOMREQUEST, \Zend_Http_Client::PUT);
+            curl_setopt($this->_getResource(), CURLOPT_POSTFIELDS, $body);
         }
 
         if (is_array($headers)) {

From 0e67cac3fcf6219f3ab29a86797b1a19ced382d8 Mon Sep 17 00:00:00 2001
From: Iurii Ivashchenko <iivashchenko@magento.com>
Date: Thu, 19 Jan 2017 15:55:01 +0200
Subject: [PATCH 7/9] MAGETWO-63342: Copyright year update

---
 app/code/Magento/Sales/etc/di.xml                               | 2 +-
 .../Magento/Sales/view/adminhtml/layout/sales_order_view.xml    | 2 +-
 lib/internal/Magento/Framework/App/Request/Http.php             | 2 +-
 lib/internal/Magento/Framework/HTTP/Adapter/Curl.php            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index eb392fc83d858..88e72e2b8a374 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
index 977e5109a12e6..4d1f4edb3bb93 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index 399d7a0b03f47..0af540a187c6d 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\App\Request;
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
index 3a8a432920dc9..42d60c4f04289 100644
--- a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2016 Magento. All rights reserved.
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 

From c6dd36c7113bdd8045907f6cf4bcfbe9d92d2150 Mon Sep 17 00:00:00 2001
From: Dmytro Yushkin <dyushkin@magento.com>
Date: Tue, 24 Jan 2017 12:43:20 +0200
Subject: [PATCH 8/9] MAGETWO-62807: Case information block on order details
 page in admin panel

- Edited sales module adminhtml extension point
---
 .../Block/Adminhtml/Order/View/AdditionalInfo.php  | 14 --------------
 .../view/adminhtml/layout/sales_order_view.xml     |  2 +-
 .../view/base/templates/container.phtml}           |  1 -
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 app/code/Magento/Sales/Block/Adminhtml/Order/View/AdditionalInfo.php
 rename app/code/Magento/{Sales/view/adminhtml/templates/order/view/additional_info.phtml => Theme/view/base/templates/container.phtml} (67%)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/AdditionalInfo.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/AdditionalInfo.php
deleted file mode 100644
index bab52f6ed7601..0000000000000
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/AdditionalInfo.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Sales\Block\Adminhtml\Order\View;
-
-use Magento\Backend\Block\Template;
-
-class AdditionalInfo extends Template
-{
-
-}
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
index 4d1f4edb3bb93..81ba3c0936cc9 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
@@ -23,7 +23,7 @@
                 <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Info" name="order_tab_info" template="order/view/tab/info.phtml">
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Messages" name="order_messages"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
-                    <block class="Magento\Sales\Block\Adminhtml\Order\View\AdditionalInfo" name="order_additional_info" template="order/view/additional_info.phtml"/>
+                    <block class="Magento\Backend\Block\Template" name="order_additional_info" template="Magento_Theme::container.phtml"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Items" name="order_items" template="order/view/items.phtml">
                         <arguments>
                             <argument name="columns" xsi:type="array">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/additional_info.phtml b/app/code/Magento/Theme/view/base/templates/container.phtml
similarity index 67%
rename from app/code/Magento/Sales/view/adminhtml/templates/order/view/additional_info.phtml
rename to app/code/Magento/Theme/view/base/templates/container.phtml
index 9fb3cae05015f..ca7910859c2ff 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/additional_info.phtml
+++ b/app/code/Magento/Theme/view/base/templates/container.phtml
@@ -4,5 +4,4 @@
  * See COPYING.txt for license details.
  */
 
-/** $block \Magento\Sales\Block\Adminhtml\Order\View\AdditionalInfo */
 echo $block->getChildHtml();

From b820263195639dc8f8ede6a573cdd91017b9b9f5 Mon Sep 17 00:00:00 2001
From: Dmytro Yushkin <dyushkin@magento.com>
Date: Wed, 25 Jan 2017 17:56:32 +0200
Subject: [PATCH 9/9] MAGETWO-62807: Case information block on order details
 page in admin panel

- Edited sales adminhtml extension point
---
 .../Sales/view/adminhtml/layout/sales_order_view.xml       | 2 +-
 app/code/Magento/Theme/view/base/templates/container.phtml | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 app/code/Magento/Theme/view/base/templates/container.phtml

diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
index 81ba3c0936cc9..feb536d18a75e 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
@@ -23,7 +23,7 @@
                 <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Info" name="order_tab_info" template="order/view/tab/info.phtml">
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Messages" name="order_messages"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
-                    <block class="Magento\Backend\Block\Template" name="order_additional_info" template="Magento_Theme::container.phtml"/>
+                    <container name="order_additional_info"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Items" name="order_items" template="order/view/items.phtml">
                         <arguments>
                             <argument name="columns" xsi:type="array">
diff --git a/app/code/Magento/Theme/view/base/templates/container.phtml b/app/code/Magento/Theme/view/base/templates/container.phtml
deleted file mode 100644
index ca7910859c2ff..0000000000000
--- a/app/code/Magento/Theme/view/base/templates/container.phtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-echo $block->getChildHtml();