0.1.0-alpha99

* Released Performance Toolkit * GitHub requests: * [#665](https://github.com/magento/magento2/issues/665) -- Main menu event in wrong area * [#666](https://github.com/magento/magento2/pull/666) -- Update di.xml * [#602](https://github.com/magento/magento2/issues/602) -- Magento\Sales\Model\Order::getFullTaxInfo() incorrectly combines percentages * [#673](https://github.com/magento/magento2/issues/673) -- Fixed fatal error during installation * Functional tests: * Updated API-functional test for Customer and Address metadata service * Add cross sell * Add a product to wishlist * Add up sell * Checkout with gift messages * Create an order from a customer * Create a shipment for offline payment methods * Delete a product from mini shopping cart * Reorder * Sales order report * Updating URL rewrites from a category page * Layout updates: * Moved layout files to the page_layout directory * Moved layout validation files to framework * Theme updates: * Blank Theme layouts & templates were unified * Search Library: * Added ability to aggregate queries for MySQL adapter * Implemented automatic range aggregation for MySQL adapter * Search module: * Introduced the Search module * Moved autocomplete to the Search module * Added base UI to the Search module * Documentation: * Added basic description of modules in the README.md files * Modularity: * Created API and script to get module and dependency information * Framework Improvements: * Decomposed heavy objects basing on profiling results * Refactored the getCustomAttributesCodes method in ProductService * Refactored Customer Model to use Group Model instead of Group Service * Updated Travis configuration to run "composer install" * Performance improvements: * Removed unnecessary "save order" call during order submission step * Fixed missing installation features of the new setup: * Added missing installation parameters: admin_no_form_key, order_increment_prefix, cleanup_database * Fixed the link to the license agreement in web installer * Fixed the web installation wizard which was stuck at 96% * Fixed bugs: * Fixed an issue where newly created attribute was always added to the Product Details tab * Fixed an issue where it was impossible to change the Stock Availability status of a product from the Advanced Inventory tab * Fixed an issue where the Stock Status value changed from In Stock to Out of Stock if quantity was not specified * Fixed an issue where performance toolkit failed in case of unknown argument * Fixed an issue where 404 error page was displayed instead of the URL Rewrite Information page * Fixed an issue where the Click for price link was not working if a product name contained quote mark * Fixed an issue where the Compare products link disappeared after switching to other page * Fixed an issue where the custom logo was not displayed on the category page * Fixed an XSS vulnerability in category name * Fixed an issue where a success save message was not displayed after saving a Search term * Fixed an issue with Google Analytics where it was impossible to add the code to the pages * Fixed an issue where import custom options grid was not displayed on the product creation page * Fixed an issue where it was impossible to retrieve a product collection from category in the "adminhtml" area * Fixed an issue where product attributes were absent on product creation form after switching to another product template * Fixed an issue where the 'URL key for specified store already exists.' error message was displayed when saving a configurable product with variations which have the same name * Fixed an issue where search in the Search Terms Report grid did not work * Fixed an issue where the unnecessary tab "General" was displayed on the Category page in the Admin panel * Fixed an issue where the Stock Status value changed from In Stock to Out of Stock if quantity was not specified for a configurable product when saving to a new template * Fixed an issue where product Stock Status was always set to 'In Stock' if product quantity was specified * Fixed an IE specific issue where for bundle products the Manage Stock option was reset to Yes * Fixed an issue where backorder messages were not displayed * Fixed an issue where the Price field was always required during Bundle product update using ProductService * Fixed an issue where product name was missing in the error message * Fixed an issue where configurable product did not contain a message to select options while adding product from wishlist to shopping cart * Fixed an issue where the Validate VAT Number button did not work during order creation in the Admin panel * Fixed an issue where Item qty in Wishlist got reset after update without changes * Fixed an issue where invoice amount was incorrect when items with discount were partially invoiced * Fixed product thumbnails alignment in the storefront * Fixed an issue where inactive Categories were not greyed out in the tree in the Admin panel * Fixed an issue where it was impossible to disable debug mode * Fixed the code sample in the index.php file * Removed language selector in the setup UI * Fixed an issue where setup was broken if db_prefix was used * Implemented usage of Symfony's PHPExecutableFinder for executing CLI tools * Fixed an issue with the Import/Export functionality * Fixed an issue with catalog product/category and category/product indexers invalidation after import * Fixed an issue with entering invalid date in the Product Views Report * Fixed an issue where it was impossible to view orders for customers from a deleted customer group * Fixed an issue where a duplicate customer record was created after adding an order from the Admin panel * Fixed an issue where it was impossible to log in to the Admin panel from the first attempt
2026-11-07 09:17:35 +00:00 · 2014-10-13 13:36:19 -07:00
1 parent 9abf9a6aad
commit 9201e4598f
@@ -33,6 +33,10 @@ before_script:
  # Change memmory_limit for travis server
  - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
  - phpenv rehash;
+  - composer install --no-interaction --prefer-source --dev
+  - cd setup
+  - composer install --no-interaction --prefer-source --dev
+  - cd ..
 script:
  # Unit tests
  - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
@@ -1,14 +1,103 @@
+0.1.0-alpha99
+=============
+ * Released Performance Toolkit
+ * GitHub requests:
+   * [#665](https://github.com/magento/magento2/issues/665) -- Main menu event in wrong area
+   * [#666](https://github.com/magento/magento2/pull/666) -- Update di.xml
+   * [#602](https://github.com/magento/magento2/issues/602) -- Magento\Sales\Model\Order::getFullTaxInfo() incorrectly combines percentages
+   * [#673](https://github.com/magento/magento2/issues/673) -- Fixed fatal error during installation
+ * Functional tests:
+   * Updated API-functional test for Customer and Address metadata service
+   * Add cross sell
+   * Add a product to wishlist
+   * Add up sell
+   * Checkout with gift messages
+   * Create an order from a customer
+   * Create a shipment for offline payment methods
+   * Delete a product from mini shopping cart
+   * Reorder
+   * Sales order report
+   * Updating URL rewrites from a category page
+ * Layout updates:
+   * Moved layout files to the page_layout directory
+   * Moved layout validation files to framework
+ * Theme updates:
+   * Blank Theme layouts & templates were unified
+ * Search Library:
+   * Added ability to aggregate queries for MySQL adapter
+   * Implemented automatic range aggregation for MySQL adapter
+ * Search module:
+   * Introduced the Search module
+   * Moved autocomplete to the Search module
+   * Added base UI to the Search module
+ * Documentation:
+   * Added basic description of modules in the README.md files
+ * Modularity:
+   * Created API and script to get module and dependency information
+ * Framework Improvements:
+   * Decomposed heavy objects basing on profiling results
+   * Refactored the getCustomAttributesCodes method in ProductService
+   * Refactored Customer Model to use Group Model instead of Group Service
+   * Updated Travis configuration to run "composer install"
+ * Performance improvements:
+   * Removed unnecessary "save order" call during order submission step
+ * Fixed missing installation features of the new setup:
+   * Added missing installation parameters: admin_no_form_key, order_increment_prefix, cleanup_database
+   * Fixed the link to the license agreement in web installer
+   * Fixed the web installation wizard which was stuck at 96%
+ * Fixed bugs:
+   * Fixed an issue where newly created attribute was always added to the Product Details tab
+   * Fixed an issue where it was impossible to change the Stock Availability status of a product from the Advanced Inventory tab
+   * Fixed an issue where the Stock Status value changed from In Stock to Out of Stock if quantity was not specified
+   * Fixed an issue where performance toolkit failed in case of unknown argument
+   * Fixed an issue where 404 error page was displayed instead of the URL Rewrite Information page
+   * Fixed an issue where the Click for price link was not working if a product name contained quote mark
+   * Fixed an issue where the Compare products link disappeared after switching to other page
+   * Fixed an issue where the custom logo was not displayed on the category page
+   * Fixed an XSS vulnerability in category name
+   * Fixed an issue where a success save message was not displayed after saving a Search term
+   * Fixed an issue with Google Analytics where it was impossible to add the code to the pages
+   * Fixed an issue where import custom options grid was not displayed on the product creation page
+   * Fixed an issue where it was impossible to retrieve a product collection from category in the "adminhtml" area
+   * Fixed an issue where product attributes were absent on product creation form after switching to another product template
+   * Fixed an issue where the 'URL key for specified store already exists.' error message was displayed when saving a configurable product with variations which have the same name
+   * Fixed an issue where search in the Search Terms Report grid did not work
+   * Fixed an issue where the unnecessary tab "General" was displayed on the Category page in the Admin panel
+   * Fixed an issue where the Stock Status value changed from In Stock to Out of Stock if quantity was not specified for a configurable product when saving to a new template
+   * Fixed an issue where product Stock Status was always set to 'In Stock' if product quantity was specified
+   * Fixed an IE specific issue where for bundle products the Manage Stock option was reset to Yes
+   * Fixed an issue where backorder messages were not displayed
+   * Fixed an issue where the Price field was always required during Bundle product update using ProductService
+   * Fixed an issue where product name was missing in the error message
+   * Fixed an issue where configurable product did not contain a message to select options while adding product from wishlist to shopping cart
+   * Fixed an issue where the Validate VAT Number button did not work during order creation in the Admin panel
+   * Fixed an issue where Item qty in Wishlist got reset after update without changes
+   * Fixed an issue where invoice amount was incorrect when items with discount were partially invoiced
+   * Fixed product thumbnails alignment in the storefront
+   * Fixed an issue where inactive Categories were not greyed out in the tree in the Admin panel
+   * Fixed an issue where it was impossible to disable debug mode
+   * Fixed the code sample in the index.php file
+   * Removed language selector in the setup UI
+   * Fixed an issue where setup was broken if db_prefix was used
+   * Implemented usage of Symfony's PHPExecutableFinder for executing CLI tools
+   * Fixed an issue with the Import/Export functionality
+   * Fixed an issue with catalog product/category and category/product indexers invalidation after import
+   * Fixed an issue with entering invalid date in the Product Views Report
+   * Fixed an issue where it was impossible to view orders for customers from a deleted customer group
+   * Fixed an issue where a duplicate customer record was created after adding an order from the Admin panel
+   * Fixed an issue where it was impossible to log in to the Admin panel from the first attempt
+
 0.1.0-alpha98
 =============
-* GitHub requests:
+ * GitHub requests:
   * [#678] (https://github.com/magento/magento2/issues/678) -- Fixed Travis CI builds
-* Functional tests:
+ * Functional tests:
   * Create Sales Order Backend
   * Delete Products from Wishlist
   * Download Products Report
   * Mass Orders Update
   * Sales Tax Report
-* Fixed bugs:
+ * Fixed bugs:
   * Fixed an issue where success message was not displayed after product review submit
   * Fixed an issue where it was impossible to start checkout process using PayPal from the JavaScript pop-up window when the Display Actual Price option was set to On Gesture
   * Fixed an issue where a fatal error was thrown after shipping method selection in PayPal Express Checkout
@@ -1,42 +0,0 @@
-<h4>Open Software License ("OSL") v. 3.0</h4>
-
-<p>This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:</p>
-<h5>Licensed under the Open Software License version 3.0</h5>
-<p>Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:</p>
-<ul class="disc">
-    <li>to reproduce the Original Work in copies, either alone or as part of a collective work</li>
-    <li>to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work</li>
-    <li>to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License</li>
-    <li>to perform the Original Work publicly</li>
-    <li>to display the Original Work publicly</li>
-</ul>
-
-<p><strong>Grant of Patent License.</strong> Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.</p>
-
-<p><strong>Grant of Source Code License.</strong> The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.</p>
-
-<p><strong>Exclusions From License Grant.</strong> Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.</p>
-
-<p><strong>External Deployment.</strong> The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).</p>
-
-<p><strong>Attribution Rights.</strong> You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.</p>
-
-<p><strong>Warranty of Provenance and Disclaimer of Warranty.</strong> Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.</p>
-
-<p><strong>Limitation of Liability.</strong> Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.</p>
-
-<p><strong>Acceptance and Termination.</strong> If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).</p>
-
-<p><strong>Termination for Patent Action.</strong> This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.</p>
-
-<p><strong>Jurisdiction, Venue and Governing Law.</strong> Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.</p>
-
-<p><strong>Attorneys Fees.</strong> In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.</p>
-
-<p><strong>Miscellaneous.</strong> If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.</p>
-
-<p><strong>Definition of "You" in This License.</strong> "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.</p>
-
-<p><strong>Right to Use.</strong> You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.</p>
-
-<p><strong>Modification of This License.</strong> This License is Copyright &copy; 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under Open Software License ("OSL") v. 3.0" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.</p>
@@ -45,4 +45,4 @@ Licensed under the Open Software License version 3.0

  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.

-  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. 
+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
@@ -3,15 +3,15 @@
    "description": "N/A",
    "require": {
        "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha98",
-        "magento/module-core": "0.1.0-alpha98",
-        "magento/module-backend": "0.1.0-alpha98",
-        "magento/framework": "0.1.0-alpha98",
+        "magento/module-store": "0.1.0-alpha99",
+        "magento/module-core": "0.1.0-alpha99",
+        "magento/module-backend": "0.1.0-alpha99",
+        "magento/framework": "0.1.0-alpha99",
        "lib-libxml": "*",
        "magento/magento-composer-installer": "*"
    },
    "type": "magento2-module",
-    "version": "0.1.0-alpha98",
+    "version": "0.1.0-alpha99",
    "extra": {
        "map": [
            [
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="adminhtml.notification.container">
        <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.notification.container.grid" as="grid">
            <arguments>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <update handle="adminhtml_notification_block"/>
    <referenceContainer name="content">
        <block class="Magento\AdminNotification\Block\Inbox" name="adminhtml.notification.container"/>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="notifications">
        <block class="Magento\AdminNotification\Block\System\Messages" name="system_messages" as="system_messages" before="-" template="Magento_AdminNotification::system/messages.phtml"/>
        <block class="Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup" name="unread_system_messages" as="unread_system_messages" after="system_messages" template="Magento_AdminNotification::system/messages/popup.phtml"/>
@@ -3,12 +3,12 @@
    "description": "Authorization module provides access to Magento ACL functionality.",
    "require": {
        "php": "~5.4.11|~5.5.0",
-        "magento/module-backend": "0.1.0-alpha98",
-        "magento/framework": "0.1.0-alpha98",
+        "magento/module-backend": "0.1.0-alpha99",
+        "magento/framework": "0.1.0-alpha99",
        "magento/magento-composer-installer": "*"
    },
    "type": "magento2-module",
-    "version": "0.1.0-alpha98",
+    "version": "0.1.0-alpha99",
    "extra": {
        "map": [
            [
@@ -3,18 +3,18 @@
    "description": "N/A",
    "require": {
        "php": "~5.4.11|~5.5.0",
-        "magento/module-sales": "0.1.0-alpha98",
-        "magento/module-checkout": "0.1.0-alpha98",
-        "magento/module-backend": "0.1.0-alpha98",
-        "magento/module-core": "0.1.0-alpha98",
-        "magento/module-payment": "0.1.0-alpha98",
-        "magento/module-centinel": "0.1.0-alpha98",
-        "magento/module-catalog": "0.1.0-alpha98",
-        "magento/framework": "0.1.0-alpha98",
+        "magento/module-sales": "0.1.0-alpha99",
+        "magento/module-checkout": "0.1.0-alpha99",
+        "magento/module-backend": "0.1.0-alpha99",
+        "magento/module-core": "0.1.0-alpha99",
+        "magento/module-payment": "0.1.0-alpha99",
+        "magento/module-centinel": "0.1.0-alpha99",
+        "magento/module-catalog": "0.1.0-alpha99",
+        "magento/framework": "0.1.0-alpha99",
        "magento/magento-composer-installer": "*"
    },
    "type": "magento2-module",
-    "version": "0.1.0-alpha98",
+    "version": "0.1.0-alpha99",
    "extra": {
        "map": [
            [
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd">
    <container name="root" label="Root">
        <block class="Magento\Authorizenet\Block\Directpost\Iframe" name="iframe" template="directpost/iframe.phtml"/>
    </container>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd">
    <container name="root">
        <block class="Magento\Authorizenet\Block\Directpost\Iframe" name="iframe" template="directpost/iframe.phtml"/>
    </container>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd">
    <container name="root">
        <block class="Magento\Authorizenet\Block\Directpost\Iframe" name="iframe" template="directpost/iframe.phtml"/>
    </container>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd">
    <container name="root">
        <block class="Magento\Authorizenet\Block\Directpost\Iframe" name="iframe" template="directpost/iframe.phtml"/>
    </container>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="head.components">
        <block class="Magento\Framework\View\Element\Js\Components" name="authorizenet_page_head_components" template="Magento_Authorizenet::js/components.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="checkout.onepage.review.info.items.after">
        <block class="Magento\Authorizenet\Block\Directpost\Form" name="payment.form.directpost" template="directpost/form.phtml">
            <action method="setMethodInfo"/>
@@ -46,10 +46,6 @@ class Dashboard extends \Magento\Backend\Block\Template

        $this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');

-        $this->addChild('lastSearches', 'Magento\Backend\Block\Dashboard\Searches\Last');
-
-        $this->addChild('topSearches', 'Magento\Backend\Block\Dashboard\Searches\Top');
-
        if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
            $block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
        } else {
@@ -29,6 +29,7 @@ namespace Magento\Backend\Block\Widget\Grid\Column\Filter;

 class Store extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
+    const ALL_STORE_VIEWS = '0';
    /**
     * @var \Magento\Store\Model\System\Store
     */
@@ -71,9 +72,9 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFil
        ) . '>';
        $value = $this->getColumn()->getValue();
        if ($allShow) {
-            $html .= '<option value="0"' . ($value == 0 ? ' selected="selected"' : '') . '>' . __(
-                'All Store Views'
-            ) . '</option>';
+            $html .= '<option value="' . self::ALL_STORE_VIEWS . '"'
+                 . ($value == self::ALL_STORE_VIEWS ? ' selected="selected"' : '') . '>'
+                 . __('All Store Views') . '</option>';
        } else {
            $html .= '<option value=""' . (!$value ? ' selected="selected"' : '') . '></option>';
        }
@@ -129,13 +130,14 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFil
     */
    public function getCondition()
    {
-        if (is_null($this->getValue())) {
+        $value = $this->getValue();
+        if (is_null($value) || $value == self::ALL_STORE_VIEWS) {
            return null;
        }
-        if ($this->getValue() == '_deleted_') {
+        if ($value == '_deleted_') {
            return array('null' => true);
        } else {
-            return array('eq' => $this->getValue());
+            return array('eq' => $value);
        }
    }
 }
@@ -27,6 +27,7 @@ namespace Magento\Backend\Model\Session;

 use Magento\Backend\App\Area\FrontNameResolver;
 use Magento\Framework\Session\Config;
+use Magento\Framework\UrlInterface;

 /**
 * Magento Backend session configuration
@@ -41,9 +42,14 @@ class AdminConfig extends Config
    const SESSION_NAME_ADMIN = 'admin';

    /**
-     * @var FrontNameResolver $frontNameResolver
+     * @var FrontNameResolver
     */
-    protected $frontNameResolver;
+    protected $_frontNameResolver;
+
+    /**
+     * @var \Magento\Framework\StoreManagerInterface
+     */
+    protected $_storeManager;

    /**
     * @param \Magento\Framework\ValidatorFactory $validatorFactory
@@ -53,6 +59,7 @@ class AdminConfig extends Config
     * @param \Magento\Framework\App\Filesystem $filesystem
     * @param string $scopeType
     * @param FrontNameResolver $frontNameResolver
+     * @param \Magento\Framework\StoreManagerInterface $storeManager
     * @param string $saveMethod
     * @param null|string $savePath
     * @param null|string $cacheLimiter
@@ -68,6 +75,7 @@ class AdminConfig extends Config
        \Magento\Framework\App\Filesystem $filesystem,
        $scopeType,
        FrontNameResolver $frontNameResolver,
+        \Magento\Framework\StoreManagerInterface $storeManager,
        $saveMethod = \Magento\Framework\Session\SaveHandlerInterface::DEFAULT_HANDLER,
        $savePath = null,
        $cacheLimiter = null,
@@ -87,7 +95,8 @@ class AdminConfig extends Config
            $lifetimePath
        );

-        $this->frontNameResolver = $frontNameResolver;
+        $this->_frontNameResolver = $frontNameResolver;
+        $this->_storeManager = $storeManager;
        $adminPath = $this->extractAdminPath();
        $this->setCookiePath($adminPath);
        $this->setName($sessionName);
@@ -100,12 +109,9 @@ class AdminConfig extends Config
     */
    private function extractAdminPath()
    {
-        $baseUrl = $this->_httpRequest->getBaseUrl();
-        $adminPath = $this->frontNameResolver->getFrontName();
-
-        if (!substr($baseUrl, -1) || ('/' != substr($baseUrl, -1))) {
-            $baseUrl = $baseUrl . '/';
-        }
+        $parsedUrl = parse_url($this->_storeManager->getStore()->getBaseUrl());
+        $baseUrl = $parsedUrl['path'];
+        $adminPath = $this->_frontNameResolver->getFrontName();

        return $baseUrl . $adminPath;
    }
@@ -40,8 +40,6 @@ namespace Magento\Backend\Model\Session;
 */
 class Quote extends \Magento\Framework\Session\SessionManager
 {
-    const XML_PATH_DEFAULT_CREATEACCOUNT_GROUP = 'customer/create_account/default_group';
-
    /**
     * Quote model object
     *
@@ -152,7 +150,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
                $this->_quote->setStoreId($this->getStoreId())->load($this->getQuoteId());
            } elseif ($this->getStoreId() && $this->hasCustomerId()) {
                $customerGroupId = $this->_scopeConfig->getValue(
-                    self::XML_PATH_DEFAULT_CREATEACCOUNT_GROUP,
+                    \Magento\Customer\Service\V1\CustomerGroupServiceInterface::XML_PATH_DEFAULT_ID,
                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                );
                $this->_quote
@@ -33,6 +33,13 @@ use Magento\Backend\Model\Menu;
 */
 class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlInterface
 {
+    /**
+     * Whether to use a security key in the backend
+     *
+     * @bug Currently, this constant is slightly misleading: it says "form key", but in fact it is used by URLs, too
+     */
+    const XML_PATH_USE_SECURE_KEY = 'admin/security/use_form_key';
+
    /**
     * Authentication session
     *
@@ -268,7 +275,7 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
     */
    public function useSecretKey()
    {
-        return $this->_scopeConfig->isSetFlag('admin/security/use_form_key') && !$this->getNoSecret();
+        return $this->_scopeConfig->isSetFlag(self::XML_PATH_USE_SECURE_KEY) && !$this->getNoSecret();
    }

    /**
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Backend\Service\V1;
+
+/**
+ * Module service.
+ */
+class ModuleService implements ModuleServiceInterface
+{
+    /**
+     * @var \Magento\Framework\Module\ModuleListInterface
+     */
+    protected $moduleList;
+    /**
+     * @param \Magento\Framework\Module\ModuleListInterface $moduleList
+     */
+    public function __construct(
+        \Magento\Framework\Module\ModuleListInterface $moduleList
+    ) {
+        $this->moduleList = $moduleList;
+    }
+
+    /**
+     * Returns an array of enabled modules
+     *
+     * @return string[]
+     */
+    public function getModules()
+    {
+        $result = [];
+        $modules = $this->moduleList->getModules();
+        foreach ($modules as $module) {
+            $result[] = $module['name'];
+        }
+        return $result;
+    }
+}
@@ -21,15 +21,15 @@
 * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
 * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 */
-namespace Magento\Setup\Module\Setup\Connection;

-interface AdapterInterface
+namespace Magento\Backend\Service\V1;
+
+interface ModuleServiceInterface
 {
    /**
-     * Get connection
+     * Returns an array of enabled modules
     *
-     * @param array $config
-     * @return \Magento\Setup\Framework\DB\Adapter\AdapterInterface|null
+     * @return string[]
     */
-    public function getConnection(array $config = array());
+    public function getModules();
 }
@@ -3,27 +3,26 @@
    "description": "N/A",
    "require": {
        "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha98",
-        "magento/module-directory": "0.1.0-alpha98",
-        "magento/module-core": "0.1.0-alpha98",
-        "magento/module-eav": "0.1.0-alpha98",
-        "magento/module-cron": "0.1.0-alpha98",
-        "magento/module-theme": "0.1.0-alpha98",
-        "magento/module-reports": "0.1.0-alpha98",
-        "magento/module-catalog-search": "0.1.0-alpha98",
-        "magento/module-sales": "0.1.0-alpha98",
-        "magento/module-catalog": "0.1.0-alpha98",
-        "magento/module-user": "0.1.0-alpha98",
-        "magento/module-backup": "0.1.0-alpha98",
-        "magento/module-email": "0.1.0-alpha98",
-        "magento/module-customer": "0.1.0-alpha98",
-        "magento/module-translation": "0.1.0-alpha98",
-        "magento/module-require-js": "0.1.0-alpha98",
-        "magento/framework": "0.1.0-alpha98",
+        "magento/module-store": "0.1.0-alpha99",
+        "magento/module-directory": "0.1.0-alpha99",
+        "magento/module-core": "0.1.0-alpha99",
+        "magento/module-eav": "0.1.0-alpha99",
+        "magento/module-cron": "0.1.0-alpha99",
+        "magento/module-theme": "0.1.0-alpha99",
+        "magento/module-reports": "0.1.0-alpha99",
+        "magento/module-sales": "0.1.0-alpha99",
+        "magento/module-catalog": "0.1.0-alpha99",
+        "magento/module-user": "0.1.0-alpha99",
+        "magento/module-backup": "0.1.0-alpha99",
+        "magento/module-email": "0.1.0-alpha99",
+        "magento/module-customer": "0.1.0-alpha99",
+        "magento/module-translation": "0.1.0-alpha99",
+        "magento/module-require-js": "0.1.0-alpha99",
+        "magento/framework": "0.1.0-alpha99",
        "magento/magento-composer-installer": "*"
    },
    "type": "magento2-module",
-    "version": "0.1.0-alpha98",
+    "version": "0.1.0-alpha99",
    "extra": {
        "map": [
            [
@@ -34,6 +34,7 @@
    <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
    <preference for="Magento\Backend\Model\UrlInterface" type="Magento\Backend\Model\Url" />
    <preference for="Magento\Backend\Block\Widget\Button\ToolbarInterface" type="Magento\Backend\Block\Widget\Button\Toolbar" />
+    <preference for="Magento\Backend\Service\V1\ModuleServiceInterface" type="Magento\Backend\Service\V1\ModuleService" />
    <type name="Magento\Backend\Block\Widget\Button\ButtonList" shared="false" />
    <type name="Magento\Framework\App\AreaList">
        <arguments>
@@ -141,10 +142,6 @@
    <type name="Magento\Backend\Controller\Adminhtml\Index\GlobalSearch">
        <arguments>
            <argument name="searchModules" xsi:type="array">
-                <item name="products" xsi:type="array">
-                    <item name="class" xsi:type="string">Magento\Backend\Model\Search\Catalog</item>
-                    <item name="acl" xsi:type="string">Magento_Catalog::catalog</item>
-                </item>
                <item name="customers" xsi:type="array">
                    <item name="class" xsi:type="string">Magento\Backend\Model\Search\Customer</item>
                    <item name="acl" xsi:type="string">Magento_Customer::customer</item>
@@ -36,7 +36,6 @@
            <module name="Magento_Cron"/>
            <module name="Magento_Theme"/>
            <module name="Magento_Reports"/>
-            <module name="Magento_CatalogSearch"/>
            <module name="Magento_Sales"/>
            <module name="Magento_Catalog"/>
            <module name="Magento_User"/>
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../app/code/Magento/Webapi/etc/webapi.xsd">
+    <route url="/V1/modules" method="GET">
+        <service class="Magento\Backend\Service\V1\ModuleServiceInterface" method="getModules"/>
+        <resources>
+            <resource ref="Magento_Adminhtml::admin"/>
+        </resources>
+    </route>
+</routes>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page layout="empty" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page layout="empty" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="main.content">
        <block class="Magento\Backend\Block\Template" name="content" template="admin/login.phtml">
            <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="adminhtml.cache.container">
        <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.cache.grid" as="grid">
            <arguments>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <update handle="formkey"/>
    <update handle="adminhtml_cache_block"/>
    <referenceContainer name="content">
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd">
    <container name="root" label="Root">
        <block class="Magento\Backend\Block\Dashboard\Tab\Customers\Most" name="adminhtml.dashboard.tab.customers.most"/>
    </container>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd">
    <container name="root" label="Root">
        <block class="Magento\Backend\Block\Dashboard\Tab\Customers\Newest" name="adminhtml.dashboard.tab.customers.newest"/>
    </container>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="page.main.actions">
        <block class="Magento\Backend\Block\Store\Switcher"
               name="store_switcher"
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd">
    <container name="root" label="Root">
        <block class="Magento\Backend\Block\Dashboard\Tab\Products\Viewed" name="adminhtml.dashboard.tab.products.viewed"/>
    </container>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page layout="admin-1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page layout="admin-1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="content">
        <block class="Magento\Backend\Block\Denied" name="content.denied" template="admin/access_denied.phtml"/>
    </referenceContainer>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="content">
        <block class="Magento\Framework\View\Element\Text" name="content.noRoute">
            <action method="setText">
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="content">
        <block class="Magento\Backend\Block\System\Account\Edit" name="adminhtml.system.account.edit"/>
    </referenceContainer>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="js">
        <block class="Magento\Backend\Block\Template" template="Magento_Backend::system/config/js.phtml"/>
        <block class="Magento\Backend\Block\Template" template="Magento_Backend::system/shipping/applicable_country.phtml"/>
@@ -23,4 +23,4 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd" />
+<page layout="admin-2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd" />
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd">
    <update handle="formkey"/>
    <update handle="adminhtml_system_design_grid_block"/>
    <container name="root">
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="adminhtml.system.design.container">
        <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.design.grid" as="grid">
            <arguments>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <update handle="formkey"/>
    <update handle="adminhtml_system_design_grid_block"/>
    <referenceContainer name="content">
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="adminhtml.system.store.container">
        <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.store.grid" as="grid">
            <arguments>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <update handle="formkey"/>
    <update handle="adminhtml_system_store_grid_block"/>
    <referenceContainer name="content">
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="page.main.actions">
        <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" />
    </referenceContainer>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="adminhtml.system.variable.grid.container">
        <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.variable.grid" as="grid">
            <arguments>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <update handle="adminhtml_system_variable_grid_block"/>
    <referenceContainer name="content">
        <block class="Magento\Backend\Block\System\Variable" name="adminhtml.system.variable.grid.container"/>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page layout="admin-1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page layout="admin-1column" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <head>
        <title>Magento Admin</title>
        <link src="prototype/prototype.js"/>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <head>
        <link src="Magento_Backend::js/bootstrap/editor.js"/>
        <css src="prototype/windows/themes/default.css"/>
@@ -24,4 +24,4 @@
 */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd"/>
+        xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/>
@@ -23,6 +23,6 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <block class="Magento\Backend\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Backend::admin/formkey.phtml"/>
 </page>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <update handle="popup"/>
    <referenceBlock name="backend.page">
        <action method="setTemplate">
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <remove name="header"/>
    <remove name="menu"/>
 </page>
@@ -3,15 +3,15 @@
    "description": "N/A",
    "require": {
        "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha98",
-        "magento/module-core": "0.1.0-alpha98",
-        "magento/module-backend": "0.1.0-alpha98",
-        "magento/module-cron": "0.1.0-alpha98",
-        "magento/framework": "0.1.0-alpha98",
+        "magento/module-store": "0.1.0-alpha99",
+        "magento/module-core": "0.1.0-alpha99",
+        "magento/module-backend": "0.1.0-alpha99",
+        "magento/module-cron": "0.1.0-alpha99",
+        "magento/framework": "0.1.0-alpha99",
        "magento/magento-composer-installer": "*"
    },
    "type": "magento2-module",
-    "version": "0.1.0-alpha98",
+    "version": "0.1.0-alpha99",
    "extra": {
        "map": [
            [
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="adminhtml.system.backup.container">
        <block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.backup.grid" as="grid">
            <arguments>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/layout_generic.xsd">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd">
    <update handle="formkey"/>
    <update handle="backup_index_block"/>
    <container name="root">
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <update handle="formkey"/>
    <update handle="backup_index_block"/>
    <referenceContainer name="content">
@@ -3,24 +3,24 @@
    "description": "N/A",
    "require": {
        "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha98",
-        "magento/module-catalog": "0.1.0-alpha98",
-        "magento/module-tax": "0.1.0-alpha98",
-        "magento/module-core": "0.1.0-alpha98",
-        "magento/module-backend": "0.1.0-alpha98",
-        "magento/module-sales": "0.1.0-alpha98",
-        "magento/module-checkout": "0.1.0-alpha98",
-        "magento/module-catalog-inventory": "0.1.0-alpha98",
-        "magento/module-customer": "0.1.0-alpha98",
-        "magento/module-catalog-rule": "0.1.0-alpha98",
-        "magento/module-eav": "0.1.0-alpha98",
-        "magento/module-gift-message": "0.1.0-alpha98",
-        "magento/framework": "0.1.0-alpha98",
-        "magento/module-webapi": "0.1.0-alpha98",
+        "magento/module-store": "0.1.0-alpha99",
+        "magento/module-catalog": "0.1.0-alpha99",
+        "magento/module-tax": "0.1.0-alpha99",
+        "magento/module-core": "0.1.0-alpha99",
+        "magento/module-backend": "0.1.0-alpha99",
+        "magento/module-sales": "0.1.0-alpha99",
+        "magento/module-checkout": "0.1.0-alpha99",
+        "magento/module-catalog-inventory": "0.1.0-alpha99",
+        "magento/module-customer": "0.1.0-alpha99",
+        "magento/module-catalog-rule": "0.1.0-alpha99",
+        "magento/module-eav": "0.1.0-alpha99",
+        "magento/module-gift-message": "0.1.0-alpha99",
+        "magento/framework": "0.1.0-alpha99",
+        "magento/module-webapi": "0.1.0-alpha99",
        "magento/magento-composer-installer": "*"
    },
    "type": "magento2-module",
-    "version": "0.1.0-alpha98",
+    "version": "0.1.0-alpha99",
    "extra": {
        "map": [
            [
@@ -37,7 +37,4 @@
            </argument>
        </arguments>
    </type>
-    <type name="Magento\Catalog\Model\Product\Attribute\Backend\Price">
-        <plugin name="bundle" type="Magento\Bundle\Model\Plugin\PriceBackend" sortOrder="100" />
-    </type>
 </config>
@@ -116,4 +116,7 @@
            </argument>
        </arguments>
    </type>
+    <type name="Magento\Catalog\Model\Product\Attribute\Backend\Price">
+        <plugin name="bundle" type="Magento\Bundle\Model\Plugin\PriceBackend" sortOrder="100" />
+    </type>
 </config>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="order_items">
        <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/shipment/create/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="shipment_items">
        <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/shipment/view/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <head>
        <css src="Magento_Bundle::css/bundle-product.css"/>
    </head>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="js">
        <block class="Magento\Framework\View\Element\Template" template="Magento_Bundle::product/stock/disabler.phtml"/>
    </referenceContainer>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="product.composite.fieldset">
        <block class="Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle" before="product.composite.fieldset.options" name="product.composite.fieldset.bundle" template="product/composite/fieldset/options/bundle.phtml">
            <block class="Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Select" name="product.info.bundle.options.select" as="select"/>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="customer.wishlist.edit.tab">
        <arguments>
            <argument name="product_configuration_helpers" xsi:type="array">
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="order_items">
        <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/creditmemo/create/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="order_items">
        <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/creditmemo/create/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="creditmemo_items">
        <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/creditmemo/view/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="order_items">
        <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/invoice/create/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="order_items">
        <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/invoice/create/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="invoice_items">
        <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="sales/invoice/view/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="order_items">
        <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\View\Items\Renderer" as="bundle" template="sales/order/view/items/renderer.phtml"/>
    </referenceBlock>
@@ -26,6 +26,7 @@
 require(['jquery'], function($){
    $('[data-tab-panel=product-details]').on('stockbeforedisable', function(e) {
        if (e.productType === 'bundle') {
+            e.stopPropagation();
            return false;
        }
    });
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="render.product.prices">
        <arguments>
            <argument name="bundle" xsi:type="array">
@@ -23,9 +23,9 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <body>
-        <attribute name="class" value="type-bundle"/>
+        <attribute name="class" value="page-product-bundle"/>
    </body>
    <referenceBlock name="product.info">
        <block class="Magento\Catalog\Block\Product\View" name="bundle.summary" as="form_top" template="Magento_Bundle::catalog/product/view/summary.phtml">
@@ -45,7 +45,9 @@
    <referenceBlock name="product.info.options.wrapper">
        <block class="Magento\Catalog\Block\Product\View" name="bundle.product.view.options.notice" template="Magento_Bundle::catalog/product/view/options/notice.phtml"/>
        <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle.options" as="type_bundle_options" template="catalog/product/view/type/bundle/options.phtml" before="-">
-            <container name="product.info.bundle.options.top" as="product_info_bundle_options_top" />
+            <container name="product.info.bundle.options.top" as="product_info_bundle_options_top">
+                <block class="Magento\Catalog\Block\Product\View" name="bundle.back.button" as="backButton" before="-" template="Magento_Bundle::catalog/product/view/backbutton.phtml"/>
+            </container>
            <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
            <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
            <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/>
@@ -55,7 +57,6 @@
    <move element="product.price.tier" destination="product.info.options.wrapper.bottom" before="-" />
    <referenceBlock name="product.info.options.wrapper.bottom">
        <block class="Magento\CatalogInventory\Block\Qtyincrements" name="product.info.qtyincrements" before="-" template="qtyincrements.phtml"/>
-        <block class="Magento\Catalog\Block\Product\View" name="bundle.back.button" as="backButton" after="-" template="Magento_Bundle::catalog/product/view/backbutton.phtml"/>
        <action method="unsetChild">
            <argument name="block" xsi:type="string">product.info.addtocart</argument>
        </action>
@@ -67,12 +68,14 @@
        </action>
    </referenceBlock>
    <referenceContainer name="content">
-        <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle-options-container" after="product.info.media"/>
+        <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle-options-container" after="product.info.main"/>
        <move element="product.info" destination="bundle.options.container" before="-"/>
    </referenceContainer>
    <referenceContainer name="product.info.type">
        <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="catalog/product/view/type/bundle.phtml"/>
        <container name="product.info.bundle.extra" after="product.info.bundle" as="product_type_data_extra" label="Product Extra Info"/>
-        <block class="Magento\Catalog\Block\Product\View" name="customize.button" as="customize_button" template="Magento_Bundle::catalog/product/view/customize.phtml"/>
+    </referenceContainer>
+    <referenceContainer name="product.info.main">
+        <block class="Magento\Catalog\Block\Product\View" name="customize.button" as="customize_button" template="Magento_Bundle::catalog/product/view/customize.phtml" after="product.info.price" />
    </referenceContainer>
 </page>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="product.info.upsell">
        <action method="setItemLimit">
            <argument name="type" xsi:type="string">bundle</argument>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <update handle="catalog_product_view_type_bundle"/>
    <referenceBlock name="head.components">
        <block class="Magento\Framework\View\Element\Js\Components" name="bundle_cart_configure_head_components" template="Magento_Checkout::js/components.phtml"/>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="checkout.cart.item.renderers">
        <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/item/default.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="checkout.cart.sidebar.item.renderers">
        <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/sidebar/default.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="checkout.onepage.review.item.renderers">
        <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::onepage/review/item.phtml"/>    </referenceBlock>
 </page>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="head.components">
        <block class="Magento\Framework\View\Element\Js\Components" name="bundle_checkout_page_head_components" template="Magento_Bundle::js/components.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="sales.email.order.creditmemo.renderers">
        <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="email/order/items/creditmemo/default.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="sales.email.order.invoice.renderers">
        <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="email/order/items/invoice/default.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="sales.email.order.renderers">
        <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="email/order/items/order/default.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="sales.email.order.shipment.renderers">
        <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="email/order/items/shipment/default.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="sales.order.creditmemo.renderers">
        <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/creditmemo/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="sales.order.invoice.renderers">
        <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/invoice/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="sales.order.items.renderers">
        <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="sales.order.print.creditmemo.renderers">
        <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/creditmemo/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="sales.order.print.invoice.renderers">
        <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/invoice/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="sales.order.print.renderers">
        <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="sales.order.print.shipment.renderers">
        <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/shipment/items/renderer.phtml"/>
    </referenceBlock>
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceBlock name="sales.order.shipment.renderers">
        <block class="Magento\Bundle\Block\Sales\Order\Items\Renderer" as="bundle" template="sales/order/shipment/items/renderer.phtml"/>
    </referenceBlock>
@@ -3,16 +3,16 @@
    "description": "N/A",
    "require": {
        "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha98",
-        "magento/module-customer": "0.1.0-alpha98",
-        "magento/module-checkout": "0.1.0-alpha98",
-        "magento/module-core": "0.1.0-alpha98",
-        "magento/module-backend": "0.1.0-alpha98",
-        "magento/framework": "0.1.0-alpha98",
+        "magento/module-store": "0.1.0-alpha99",
+        "magento/module-customer": "0.1.0-alpha99",
+        "magento/module-checkout": "0.1.0-alpha99",
+        "magento/module-core": "0.1.0-alpha99",
+        "magento/module-backend": "0.1.0-alpha99",
+        "magento/framework": "0.1.0-alpha99",
        "magento/magento-composer-installer": "*"
    },
    "type": "magento2-module",
-    "version": "0.1.0-alpha98",
+    "version": "0.1.0-alpha99",
    "extra": {
        "map": [
            [
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="form.additional.info">
        <block class="Magento\Captcha\Block\Captcha" name="captcha">
            <action method="setFormId">
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="form.additional.info">
        <block class="Magento\Captcha\Block\Captcha" name="captcha">
            <action method="setFormId">
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="form.login.additional.info">
        <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-">
            <action method="setFormId">
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="form.additional.info">
        <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-">
            <action method="setFormId">
@@ -23,7 +23,7 @@
 * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../Core/etc/page.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
    <referenceContainer name="form.additional.info">
        <block class="Magento\Captcha\Block\Captcha" name="captcha" after="-">
            <action method="setFormId">