diff --git a/Magento2/Sniffs/Legacy/LayoutSniff.php b/Magento2/Sniffs/Legacy/LayoutSniff.php
new file mode 100644
index 00000000..3a2c2044
--- /dev/null
+++ b/Magento2/Sniffs/Legacy/LayoutSniff.php
@@ -0,0 +1,404 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento2\Sniffs\Legacy;
+
+use DOMDocument;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use SimpleXMLElement;
+
+/**
+ * Test for obsolete nodes/attributes in layouts
+ */
+class LayoutSniff implements Sniff
+{
+    private const ERROR_CODE_XML = 'WrongXML';
+    private const ERROR_CODE_NOT_ALLOWED = 'NotAllowed';
+    private const ERROR_CODE_OBSOLETE = 'Obsolete';
+    private const ERROR_CODE_OBSOLETE_CLASS = 'ObsoleteClass';
+    private const ERROR_CODE_METHOD_NOT_ALLOWED = 'MethodNotAllowed';
+    private const ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_NOT_ALLOWED = 'CharacterNotAllowedInAttribute';
+    private const ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_EXPECTED = 'CharacterExpectedInAttribute';
+
+    /**
+     * List of obsolete references per handle
+     *
+     * @var array
+     */
+    private $obsoleteReferences = [
+        'adminhtml_user_edit' => [
+            'adminhtml.permissions.user.edit.tabs',
+            'adminhtml.permission.user.edit.tabs',
+            'adminhtml.permissions.user.edit',
+            'adminhtml.permission.user.edit',
+            'adminhtml.permissions.user.roles.grid.js',
+            'adminhtml.permission.user.roles.grid.js',
+            'adminhtml.permissions.user.edit.tab.roles',
+            'adminhtml.permissions.user.edit.tab.roles.js',
+        ],
+        'adminhtml_user_role_index' => [
+            'adminhtml.permission.role.index',
+            'adminhtml.permissions.role.index',
+            'adminhtml.permissions.role.grid',
+        ],
+        'adminhtml_user_role_rolegrid' => ['adminhtml.permission.role.grid', 'adminhtml.permissions.role.grid'],
+        'adminhtml_user_role_editrole' => [
+            'adminhtml.permissions.editroles',
+            'adminhtml.permissions.tab.rolesedit',
+            'adminhtml.permission.roles.users.grid.js',
+            'adminhtml.permissions.roles.users.grid.js',
+            'adminhtml.permission.role.buttons',
+            'adminhtml.permissions.role.buttons',
+            'adminhtml.permission.role.edit.gws',
+        ],
+        'adminhtml_user_role_editrolegrid' => [
+            'adminhtml.permission.role.grid.user',
+            'adminhtml.permissions.role.grid.user',
+        ],
+        'adminhtml_user_index' => ['adminhtml.permission.user.index', 'adminhtml.permissions.user.index'],
+        'adminhtml_user_rolegrid' => [
+            'adminhtml.permissions.user.rolegrid',
+            'adminhtml.permission.user.rolegrid',
+        ],
+        'adminhtml_user_rolesgrid' => [
+            'adminhtml.permissions.user.rolesgrid',
+            'adminhtml.permission.user.rolesgrid',
+        ],
+    ];
+
+    /**
+     * List of allowed method names
+     *
+     * @var string[]
+     */
+    private $allowedActionNodeMethods = [
+        'addBodyClass',
+        'addButtons',
+        'addColumnCountLayoutDepend',
+        'addCrumb',
+        'addDatabaseBlock',
+        'addInputTypeTemplate',
+        'addNotice',
+        'addReportTypeOption',
+        'addTab',
+        'addTabAfter',
+        'addText',
+        'append',
+        'removeTab',
+        'setActive',
+        'setAddressType',
+        'setAfterCondition',
+        'setAfterTotal',
+        'setAtCall',
+        'setAtCode',
+        'setAtLabel',
+        'setAuthenticationStartMode',
+        'setBeforeCondition',
+        'setBlockId',
+        'setBugreportUrl',
+        'setCanLoadExtJs',
+        'setCanLoadRulesJs',
+        'setCanLoadTinyMce',
+        'setClassName',
+        'setColClass',
+        'setColumnCount',
+        'setColumnsLimit',
+        'setCssClass',
+        'setDefaultFilter',
+        'setDefaultStoreName',
+        'setDestElementId',
+        'setDisplayArea',
+        'setDontDisplayContainer',
+        'setEmptyGridMessage',
+        'setEntityModelClass',
+        'setFieldOption',
+        'setFieldVisibility',
+        'setFormCode',
+        'setFormId',
+        'setFormPrefix',
+        'setGiftRegistryTemplate',
+        'setGiftRegistryUrl',
+        'setGridHtmlClass',
+        'setGridHtmlCss',
+        'setGridHtmlId',
+        'setHeaderTitle',
+        'setHideBalance',
+        'setHideLink',
+        'setHideRequiredNotice',
+        'setHtmlClass',
+        'setId',
+        'setImageType',
+        'setImgAlt',
+        'setImgHeight',
+        'setImgSrc',
+        'setImgWidth',
+        'setInList',
+        'setInfoTemplate',
+        'setIsCollapsed',
+        'setIsDisabled',
+        'setIsEnabled',
+        'setIsGuestNote',
+        'setIsHandle',
+        'setIsLinkMode',
+        'setIsPlaneMode',
+        'setIsTitleHidden',
+        'setIsViewCurrent',
+        'setItemLimit',
+        'setLabel',
+        'setLabelProperties',
+        'setLayoutCode',
+        'setLinkUrl',
+        'setListCollection',
+        'setListModes',
+        'setListOrders',
+        'setMAPTemplate',
+        'setMethodFormTemplate',
+        'setMyClass',
+        'setPageLayout',
+        'setPageTitle',
+        'setParentType',
+        'setControllerPath',
+        'setPosition',
+        'setPositioned',
+        'setRewardMessage',
+        'setRewardQtyLimitationMessage',
+        'setShouldPrepareInfoTabs',
+        'setShowPart',
+        'setSignupLabel',
+        'setSourceField',
+        'setStoreVarName',
+        'setStrong',
+        'setTemplate',
+        'setText',
+        'setThemeName',
+        'setTierPriceTemplate',
+        'setTitle',
+        'setTitleClass',
+        'setTitleId',
+        'setToolbarBlockName',
+        'setType',
+        'setUseConfirm',
+        'setValueProperties',
+        'setViewAction',
+        'setViewColumn',
+        'setViewLabel',
+        'setViewMode',
+        'setWrapperClass',
+        'unsetChild',
+        'unsetChildren',
+        'updateButton',
+        'setIsProductListingContext',
+    ];
+
+    /**
+     * @inheritdoc
+     */
+    public function register(): array
+    {
+        return [
+            T_INLINE_HTML
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr > 0) {
+            return;
+        }
+
+        $layout = simplexml_load_string($this->getFormattedXML($phpcsFile));
+
+        if ($layout === false) {
+            $phpcsFile->addError(
+                sprintf(
+                    "Couldn't parse contents of '%s', check that they are in valid XML format",
+                    $phpcsFile->getFilename(),
+                ),
+                $stackPtr,
+                self::ERROR_CODE_XML
+            );
+            return;
+        }
+
+        $this->testObsoleteReferences($layout, $phpcsFile);
+        $this->testHeadBlocks($layout, $phpcsFile);
+        $this->testOutputAttribute($layout, $phpcsFile);
+        $this->testHelperAttribute($layout, $phpcsFile);
+        $this->testListText($layout, $phpcsFile);
+        $this->testActionNodeMethods($layout, $phpcsFile);
+    }
+
+    /**
+     * Check for obsolete block references
+     *
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testObsoleteReferences(SimpleXMLElement $layout, File $phpcsFile): void
+    {
+        foreach ($layout as $handle) {
+            $handleAttribute = (string)$handle->attributes()->handle;
+            if (!isset($this->obsoleteReferences[$handleAttribute])) {
+                continue;
+            }
+            foreach ($handle->xpath('//reference | //referenceContainer | //referenceBlock') as $reference) {
+                if (in_array((string)$reference['name'], $this->obsoleteReferences[$handleAttribute]) !== false) {
+                    $phpcsFile->addError(
+                        'The block being referenced is removed.',
+                        dom_import_simplexml($reference)->getLineNo()-1,
+                        self::ERROR_CODE_OBSOLETE
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Format the incoming XML to avoid tags split into several lines.
+     *
+     * @param File $phpcsFile
+     * @return false|string
+     */
+    private function getFormattedXML(File $phpcsFile)
+    {
+        $doc = new DomDocument('1.0');
+        $doc->formatOutput = true;
+        $doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
+        return $doc->saveXML();
+    }
+
+    /**
+     * Check that CSS, Link and Script blocks are inside a head block
+     *
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testHeadBlocks(SimpleXMLElement $layout, File $phpcsFile): void
+    {
+        $selectorHeadBlock = '(name()="block" or name()="referenceBlock") and ' .
+            '(@name="head" or @name="convert_root_head" or @name="vde_head")';
+        $elements = $layout->xpath(
+            '//block[@class="Magento\Theme\Block\Html\Head\Css" ' .
+            'or @class="Magento\Theme\Block\Html\Head\Link" ' .
+            'or @class="Magento\Theme\Block\Html\Head\Script"]' .
+            '/parent::*[not(' .
+            $selectorHeadBlock .
+            ')]'
+        );
+        if (!empty($elements)) {
+            $phpcsFile->addError(
+                'Blocks \Magento\Theme\Block\Html\Head\{Css,Link,Script} ' .
+                'are allowed within the "head" block only. ' .
+                'Verify integrity of the nodes nesting.',
+                dom_import_simplexml($elements[0])->getLineNo(),
+                self::ERROR_CODE_NOT_ALLOWED
+            );
+        };
+    }
+
+    /**
+     * Check that the output attribute has the right value
+     *
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testOutputAttribute(SimpleXMLElement $layout, File $phpcsFile): void
+    {
+        $elements = $layout->xpath('/layout//*[@output="toHtml"]');
+        if (!empty($elements)) {
+            $phpcsFile->addError(
+                'output="toHtml" is obsolete. Use output="1"',
+                dom_import_simplexml($elements[0])->getLineNo()-1,
+                self::ERROR_CODE_OBSOLETE
+            );
+        };
+    }
+
+    /**
+     * Returns attribute value by attribute name
+     *
+     * @param SimpleXMLElement $element
+     * @param string $name
+     * @return string|null
+     */
+    private function getAttribute(SimpleXMLElement $element, string $name): string
+    {
+        $attrs = $element->attributes();
+        return isset($attrs[$name]) ? (string)$attrs[$name] : '';
+    }
+
+    /**
+     * Check values in helper attributes
+     *
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testHelperAttribute(SimpleXMLElement $layout, File $phpcsFile): void
+    {
+        foreach ($layout->xpath('//*[@helper]') as $action) {
+            if (strpos($this->getAttribute($action, 'helper'), '/') !== false) {
+                $phpcsFile->addError(
+                    "'helper' attribute contains '/'",
+                    dom_import_simplexml($action)->getLineNo()-1,
+                    self::ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_NOT_ALLOWED
+                );
+            }
+            if (strpos($this->getAttribute($action, 'helper'), '::') === false) {
+                $phpcsFile->addError(
+                    "'helper' attribute does not contain '::'",
+                    dom_import_simplexml($action)->getLineNo()-1,
+                    self::ERROR_CODE_HELPER_ATTRIBUTE_CHARACTER_EXPECTED
+                );
+            }
+        }
+    }
+
+    /**
+     * Check that ListText is not used
+     *
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testListText(SimpleXMLElement $layout, File $phpcsFile): void
+    {
+        $elements = $layout->xpath('/layout//block[@class="Magento\Framework\View\Element\Text\ListText"]');
+        if (!empty($elements)) {
+            $phpcsFile->addError(
+                'The class \Magento\Framework\View\Element\Text\ListText' .
+                ' is not supposed to be used in layout anymore.',
+                dom_import_simplexml($elements[0])->getLineNo()-1,
+                self::ERROR_CODE_OBSOLETE_CLASS
+            );
+        };
+    }
+
+    /**
+     * Check that action is calling an allowed method
+     *
+     * @param SimpleXMLElement $layout
+     * @param File $phpcsFile
+     */
+    private function testActionNodeMethods(SimpleXMLElement $layout, File $phpcsFile): void
+    {
+        $methodFilter = '@method!="' . implode('" and @method!="', $this->allowedActionNodeMethods) . '"';
+        foreach ($layout->xpath('//action[' . $methodFilter . ']') as $node) {
+            $attributes = $node->attributes();
+            $phpcsFile->addError(
+                sprintf(
+                    'Call of method "%s" via layout instruction <action> is not allowed.',
+                    $attributes['method']
+                ),
+                dom_import_simplexml($node)->getLineNo()-1,
+                self::ERROR_CODE_METHOD_NOT_ALLOWED
+            );
+        }
+    }
+}
diff --git a/Magento2/Tests/Legacy/LayoutUnitTest.1.xml b/Magento2/Tests/Legacy/LayoutUnitTest.1.xml
new file mode 100644
index 00000000..591b51ae
--- /dev/null
+++ b/Magento2/Tests/Legacy/LayoutUnitTest.1.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page layout="3columns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="adminhtml_user_edit"/>
+    <body>
+        <attribute name="id" value="html-body"/>
+        <block name="require.js" class="Magento\Framework\View\Element\Template" template="Magento_Theme::page/js/require_js.phtml" />
+        <referenceContainer name="adminhtml.permission.user.edit.tabs">
+            <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
+            <block class="Magento\Framework\View\Element\Js\Cookie" name="js_cookies" template="Magento_Theme::js/cookie.phtml">
+                <arguments>
+                    <argument name="session_config" xsi:type="object">Magento\Theme\ViewModel\Block\SessionConfig</argument>
+                </arguments>
+            </block>
+            <block class="Magento\Theme\Block\Html\Notices" name="global_notices" template="Magento_Theme::html/notices.phtml"/>
+        </referenceContainer>
+        <referenceBlock name="adminhtml.permission.user.edit">
+            <block class="Magento\Theme\Block\Html\Head\Css">
+            </block>
+            <block class="Magento\Theme\Block\Html\Header" name="header" as="header" before="-">
+                <arguments>
+                    <argument name="show_part" xsi:type="string">welcome</argument>
+                </arguments>
+            </block>
+        </referenceBlock>
+        <referenceContainer name="main.content">
+            <block class="Magento\Framework\View\Element\Template" name="skip_to_content.target" before="-" template="Magento_Theme::html/skiptarget.phtml">
+                <arguments>
+                    <argument name="target_id" xsi:type="string">contentarea</argument>
+                </arguments>
+            </block>
+        </referenceContainer>
+        <referenceContainer name="header.container">
+            <container name="header.panel.wrapper" htmlClass="panel wrapper" htmlTag="div" before="-">
+                <container name="header.panel" label="Page Header Panel" htmlTag="div" htmlClass="panel header">
+                    <block class="Magento\Framework\View\Element\Template" name="skip_to_content" template="Magento_Theme::html/skip.phtml">
+                        <arguments>
+                            <argument name="target" xsi:type="string">contentarea</argument>
+                            <argument name="label" translate="true" xsi:type="string">Skip to Content</argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Store\Block\Switcher" name="store_language" as="store_language" template="Magento_Store::switch/languages.phtml">
+                        <arguments>
+                            <argument name="view_model" xsi:type="object">Magento\Store\ViewModel\SwitcherUrlProvider</argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Customer\Block\Account\Navigation" name="top.links">
+                        <arguments>
+                            <argument name="css_class" xsi:type="string">header links</argument>
+                        </arguments>
+                    </block>
+                </container>
+            </container>
+            <container name="header-wrapper" label="Page Header" as="header-wrapper" htmlTag="div" htmlClass="header content">
+                <block class="Magento\Theme\Block\Html\Header\Logo" name="logo">
+                    <arguments>
+                        <argument name="logoPathResolver" xsi:type="object">Magento\Theme\ViewModel\Block\Html\Header\LogoPathResolver</argument>
+                        <argument name="logo_size_resolver" xsi:type="object">Magento\Theme\ViewModel\Block\Html\Header\LogoSizeResolver</argument>
+                    </arguments>
+                </block>
+            </container>
+        </referenceContainer>
+        <referenceContainer name="page.top">
+            <block class="Magento\Framework\View\Element\Template" name="navigation.sections" before="-" template="Magento_Theme::html/sections.phtml">
+                <arguments>
+                    <argument name="group_name" xsi:type="string">navigation-sections</argument>
+                    <argument name="group_css" xsi:type="string">nav-sections</argument>
+                </arguments>
+                <block class="Magento\Framework\View\Element\Template" name="store.menu" group="navigation-sections" template="Magento_Theme::html/container.phtml">
+                    <arguments>
+                        <argument name="title" translate="true" xsi:type="string">Menu</argument>
+                    </arguments>
+                    <block class="Magento\Theme\Block\Html\Topmenu" name="catalog.topnav" template="Magento_Theme::html/topmenu.phtml" ttl="3600" before="-"/>
+                </block>
+                <block class="Magento\Framework\View\Element\Text" name="store.links" group="navigation-sections">
+                    <arguments>
+                        <argument name="title" translate="true" xsi:type="string">Account</argument>
+                        <argument name="use_force" xsi:type="boolean">true</argument>
+                        <argument name="text" xsi:type="string"><![CDATA[<!-- Account links -->]]></argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Framework\View\Element\Template" name="store.settings" group="navigation-sections" template="Magento_Theme::html/container.phtml">
+                    <arguments>
+                        <argument name="title" translate="true" xsi:type="string">Settings</argument>
+                    </arguments>
+                    <block class="Magento\Store\Block\Switcher" name="store.settings.language" template="Magento_Store::switch/languages.phtml">
+                        <arguments>
+                            <argument name="id_modifier" xsi:type="string">nav</argument>
+                            <argument name="view_model" xsi:type="object">Magento\Store\ViewModel\SwitcherUrlProvider</argument>
+                        </arguments>
+                    </block>
+                    <block class="Magento\Directory\Block\Currency" name="store.settings.currency" template="Magento_Directory::currency.phtml">
+                        <arguments>
+                            <argument name="id_modifier" xsi:type="string">nav</argument>
+                        </arguments>
+                    </block>
+                </block>
+            </block>
+            <container name="top.container" as="topContainer" label="After Page Header Top" htmlTag="div" htmlClass="top-container"/>
+            <block class="Magento\Theme\Block\Html\Breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>
+        </referenceContainer>
+        <referenceContainer name="columns.top">
+            <block class="Magento\Theme\Block\Html\Title" name="page.main.title" template="Magento_Theme::html/title.phtml"/>
+            <container name="page.messages" htmlTag="div" htmlClass="page messages">
+                <block class="Magento\Framework\View\Element\Template" name="ajax.message.placeholder" template="Magento_Theme::html/messages.phtml"/>
+                <block class="Magento\Framework\View\Element\Messages" name="messages" as="messages" template="Magento_Theme::messages.phtml"/>
+            </container>
+        </referenceContainer>
+        <referenceContainer name="main">
+            <container name="content.top" label="Main Content Top">
+                <block name="main_css_preloader" as="main_css_preloader" template="Magento_Theme::html/main_css_preloader.phtml" ifconfig="dev/css/use_css_critical_path"/>
+            </container>
+            <container name="content" label="Main Content Area"/>
+            <container name="content.aside" label="Main Content Aside"/>
+            <container name="content.bottom" label="Main Content Bottom"/>
+        </referenceContainer>
+        <referenceContainer name="page.bottom.container">
+            <container name="page.bottom" label="Before Page Footer" htmlTag="div" htmlClass="content"/>
+        </referenceContainer>
+        <referenceContainer name="footer-container">
+            <container name="footer" as="footer" label="Page Footer" htmlTag="div" htmlClass="footer content">
+                <block class="Magento\Store\Block\Switcher" name="store_switcher" as="store_switcher" template="Magento_Store::switch/stores.phtml"/>
+                <block class="Magento\Framework\View\Element\Html\Links" name="footer_links">
+                    <arguments>
+                        <argument name="css_class" xsi:type="string">footer links</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Theme\Block\Html\Footer" name="copyright" template="Magento_Theme::html/copyright.phtml"/>
+                <block class="Magento\Framework\View\Element\Template" name="report.bugs" template="Magento_Theme::html/bugreport.phtml" ifconfig="design/footer/report_bugs"/>
+            </container>
+        </referenceContainer>
+        <referenceContainer name="before.body.end">
+            <block class="Magento\Theme\Block\Html\Footer" name="absolute_footer" template="Magento_Theme::html/absolute_footer.phtml" />
+        </referenceContainer>
+        <referenceContainer name="content">
+            <block class="Magento\Framework\View\Element\FormKey" name="formkey"/>
+        </referenceContainer>
+        <referenceContainer name="form.additional.info">
+            <block class="Magento\Captcha\Block\Captcha" name="captcha" cacheable="false">
+                <action method="notAllowedMethod">
+                    <argument name="formId" xsi:type="string">backend_login</argument>
+                </action>
+                <action method="anotherNotallowedMethod">
+                    <argument name="width" xsi:type="string">226</argument>
+                </action>
+                <action method="setImgHeight">
+                    <argument name="width" xsi:type="string">50</argument>
+                </action>
+            </block>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/Magento2/Tests/Legacy/LayoutUnitTest.2.xml b/Magento2/Tests/Legacy/LayoutUnitTest.2.xml
new file mode 100644
index 00000000..04227a27
--- /dev/null
+++ b/Magento2/Tests/Legacy/LayoutUnitTest.2.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_layout.xsd">
+    <update handle="2columns-left" />
+
+    <container name="columns.top.wrapper" htmlTag="div" htmlClass="page-main" output="toHtml"/>
+    <move element="columns.top" destination="columns.top.wrapper"/>
+    <move element="columns.top.wrapper" destination="page.wrapper" after="page.top"/>
+    <move element="category.view.container" destination="page.wrapper" after="columns.top.wrapper"/>
+
+    <container name="category.image.wrapper" htmlTag="div" htmlClass="page-main"/>
+    <move element="category.image" destination="category.image.wrapper"/>
+    <move element="category.image.wrapper" destination="category.view.container"/>
+
+    <container name="category.description.wrapper" htmlTag="div"/>
+    <move element="category.description" destination="category.description.wrapper"/>
+    <move element="category.description.wrapper" destination="category.view.container" after="category.image.wrapper"/>
+
+    <container name="category.cms.wrapper" htmlTag="div" htmlClass="page-main"/>
+    <move element="category.cms" destination="category.cms.wrapper"/>
+    <move element="category.cms.wrapper" destination="category.view.container" after="category.description.wrapper"/>
+
+    <block name="list" class="Magento\Framework\View\Element\Text\ListText" />
+</layout>
diff --git a/Magento2/Tests/Legacy/LayoutUnitTest.3.xml b/Magento2/Tests/Legacy/LayoutUnitTest.3.xml
new file mode 100644
index 00000000..bd34978b
--- /dev/null
+++ b/Magento2/Tests/Legacy/LayoutUnitTest.3.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="checkout.onepage.review.info.items.after">
+            <block class="Magento\Paypal\Block\Iframe" name="paypal.iframe" cacheable="false"/>
+        </referenceContainer>
+        <referenceBlock name="checkout.onepage.review.button">
+            <action method="setTemplate">
+                <argument name="template" xsi:type="helper" helper="Magento\Paypal\Helper\Hss">
+                    <param name="name">Magento_Paypal::hss/review/button.phtml</param>
+                </argument>
+                <argument name="template" xsi:type="helper" helper="Magento/Paypal/Helper/Hss::getReviewButtonTemplate">
+                    <param name="name">Magento_Paypal::hss/review/button.phtml</param>
+                </argument>
+                <argument name="template" xsi:type="helper" helper="Magento\Paypal\Helper\Hss::getReviewButtonTemplate">
+                    <param name="name">Magento_Paypal::hss/review/button.phtml</param>
+                </argument>
+            </action>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/Magento2/Tests/Legacy/LayoutUnitTest.php b/Magento2/Tests/Legacy/LayoutUnitTest.php
new file mode 100644
index 00000000..8e7a6551
--- /dev/null
+++ b/Magento2/Tests/Legacy/LayoutUnitTest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Legacy;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class LayoutUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList($testFile = '')
+    {
+        if ($testFile === 'LayoutUnitTest.1.xml') {
+            return [
+                13 => 1,
+                22 => 1,
+                23 => 1,
+                145 => 1,
+                148 => 1,
+            ];
+        }
+        if ($testFile === 'LayoutUnitTest.2.xml') {
+            return [
+                11 => 1,
+                28 => 1,
+            ];
+        }
+        if ($testFile === 'LayoutUnitTest.3.xml') {
+            return [
+                15 => 1,
+                18 => 1,
+            ];
+        }
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList($testFile = '')
+    {
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
index 1b1c7f1b..5ee2fa25 100644
--- a/Magento2/ruleset.xml
+++ b/Magento2/ruleset.xml
@@ -142,6 +142,11 @@
         <type>error</type>
         <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
+    <rule ref="Magento2.Legacy.Layout">
+        <severity>10</severity>
+        <type>error</type>
+        <include-pattern>*/view/(adminhtml|frontend|base)/*\/.xml</include-pattern>
+    </rule>
     <rule ref="Magento2.Legacy.RestrictedCode">
         <severity>10</severity>
         <type>error</type>