MAGETWO-70256: M2 5381 #10052

 - Merge Pull Request #10052 from tzyganu/magento2:M2-5381
 - Merged commits:
   1. f8e4007
   2. cba9cfd

Author: Oleksii Korshenko

app/code/Magento/Catalog/Block/Product/AbstractProduct.php

@@ -96,6 +96,11 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
      */
     protected $stockRegistry;
 
+    /**
+     * @var ImageBuilder
+     */
+    protected $imageBuilder;
+
     /**
      * @param Context $context
      * @param array $data

lib/internal/Magento/Framework/Config/etc/view.xsd

@@ -38,10 +38,10 @@
         <xs:attribute name="value" type="xs:string"/>
     </xs:complexType>
     <xs:complexType name="mediaType" mixed="true">
-        <xs:all>
-            <xs:element name="images" type="imageType" minOccurs="0"/>
-            <xs:element name="videos" type="videoType" minOccurs="0"/>
-        </xs:all>
+        <xs:sequence>
+            <xs:element name="images" type="imageType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="videos" type="videoType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
     </xs:complexType>
 
     <xs:complexType name="imageType">