diff --git a/app/code/Magento/Ui/etc/ui_configuration.xsd b/app/code/Magento/Ui/etc/ui_configuration.xsd
index 6847f226dd609..c43e45eb8e111 100644
--- a/app/code/Magento/Ui/etc/ui_configuration.xsd
+++ b/app/code/Magento/Ui/etc/ui_configuration.xsd
@@ -209,6 +209,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -287,7 +310,7 @@
-
+
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd
index 7cc33cf4351df..21ca445a4177b 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/boolean.xsd
@@ -12,6 +12,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +39,6 @@
-
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd
index f4b4dd403509f..3c9866e6845e7 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/button.xsd
@@ -23,6 +23,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd
index 13bc629606470..4dfb074498e5b 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkbox.xsd
@@ -12,6 +12,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +39,6 @@
-
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd
index b0dea52cb4bd9..8fa509fa594d6 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/checkboxset.xsd
@@ -12,6 +12,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +39,6 @@
-
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd
index b24ba626a9ea1..a2a8fbbe103c1 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/date.xsd
@@ -12,6 +12,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +39,6 @@
-
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd
index cd1147b560034..648eaf9db5b18 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/email.xsd
@@ -12,6 +12,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +39,6 @@
-
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd
index eac284ddc92d8..1536f752a0aaf 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/file.xsd
@@ -12,6 +12,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +39,6 @@
-
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd
index 3181a7ab673cd..664a2d0e8d904 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/fileUploader.xsd
@@ -23,6 +23,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd
index 82282dd61673f..0e7a6f4ed5fe0 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/hidden.xsd
@@ -12,6 +12,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +39,6 @@
-
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd
index 6bb29ba2e9069..f32d5c2c0fe8f 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/imageUploader.xsd
@@ -23,6 +23,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd
index fc3ea2d92576a..047212f3973e4 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/input.xsd
@@ -15,6 +15,7 @@
+
@@ -23,6 +24,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -73,7 +86,6 @@
-
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd
index 28d9d24868820..aefb0328c8800 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/multiselect.xsd
@@ -12,6 +12,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd
index 5a3053e59be95..69b936c3e5f8a 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/price.xsd
@@ -12,7 +12,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd
index c53ad0333d6d7..f2db9a57c5a1c 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/radioset.xsd
@@ -12,6 +12,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +39,6 @@
-
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd
index 7e0d2dfbfeb18..76d37de771a4c 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/select.xsd
@@ -15,6 +15,7 @@
+
@@ -29,9 +30,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd
index e382af84111c7..813ad7870bfe9 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/text.xsd
@@ -12,6 +12,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +39,6 @@
-
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd
index ad7fda6200a79..67ee63a3f889f 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/textarea.xsd
@@ -12,6 +12,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +39,6 @@
-
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd
index 62c81234aba33..3e7bbb3a59f8c 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/wysiwyg.xsd
@@ -12,6 +12,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,7 +39,6 @@
-