diff --git a/typo3/sysext/form/Configuration/Yaml/FormElements/Number.yaml b/typo3/sysext/form/Configuration/Yaml/FormElements/Number.yaml
index 5d31cfe38fbe63fb17319a5115a5244affa3b7ed..eae1e27d4f790a8e8e15040a3186ca6542c84e99 100644
--- a/typo3/sysext/form/Configuration/Yaml/FormElements/Number.yaml
+++ b/typo3/sysext/form/Configuration/Yaml/FormElements/Number.yaml
@@ -33,10 +33,17 @@ TYPO3:
                     propertyPath: defaultValue
                     propertyValidators:
                       10: IntegerOrEmpty
-                  700:
+                  550:
                     identifier: step
                     templateName: Inspector-TextEditor
                     label: formEditor.elements.TextMixin.editor.step.label
+                    propertyPath: properties.fluidAdditionalAttributes.step
+                    propertyValidators:
+                      10: Integer
+                  700:
+                    identifier: gridColumnViewPortConfiguration
+                    templateName: Inspector-GridColumnViewPortConfigurationEditor
+                    label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.label
                     configurationOptions:
                       viewPorts:
                         10:
@@ -61,9 +68,6 @@ TYPO3:
                         label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.numbersOfColumnsToUse.label
                         propertyPath: 'properties.gridColumnClassAutoConfiguration.viewPorts.{@viewPortIdentifier}.numbersOfColumnsToUse'
                         fieldExplanationText: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.numbersOfColumnsToUse.fieldExplanationText
-                    propertyPath: properties.fluidAdditionalAttributes.step
-                    propertyValidators:
-                      10: Integer
                   800:
                     identifier: requiredValidator
                     templateName: Inspector-RequiredValidatorEditor
diff --git a/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor.rst b/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor.rst
index 507869198c52578f9d5d6a30f50c44843dd394b3..06b2ecb2f9021482a4adcd80c35f31372ec3ad44 100644
--- a/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor.rst
+++ b/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor.rst
@@ -30,7 +30,7 @@ formEditor
                   templateName: Inspector-TextEditor
                   label: formEditor.elements.FormElement.editor.label.label
                   propertyPath: label
-               230:
+                230:
                   identifier: elementDescription
                   templateName: Inspector-TextEditor
                   label: formEditor.elements.FormElement.editor.elementDescription.label
@@ -48,13 +48,35 @@ formEditor
                   propertyPath: defaultValue
                   propertyValidators:
                     10: IntegerOrEmpty
-                700:
+                550:
                   identifier: step
                   templateName: Inspector-TextEditor
                   label: formEditor.elements.TextMixin.editor.step.label
                   propertyPath: properties.fluidAdditionalAttributes.step
                   propertyValidators:
                     10: Integer
+                700:
+                  identifier: gridColumnViewPortConfiguration
+                  templateName: Inspector-GridColumnViewPortConfigurationEditor
+                  label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.label
+                  configurationOptions:
+                    viewPorts:
+                      10:
+                        viewPortIdentifier: xs
+                        label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.xs.label
+                      20:
+                        viewPortIdentifier: sm
+                        label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.sm.label
+                      30:
+                        viewPortIdentifier: md
+                        label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.md.label
+                      40:
+                        viewPortIdentifier: lg
+                        label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.lg.label
+                    numbersOfColumnsToUse:
+                      label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.numbersOfColumnsToUse.label
+                      propertyPath: 'properties.gridColumnClassAutoConfiguration.viewPorts.{@viewPortIdentifier}.numbersOfColumnsToUse'
+                      fieldExplanationText: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.numbersOfColumnsToUse.fieldExplanationText
                 800:
                   identifier: requiredValidator
                   templateName: Inspector-RequiredValidatorEditor
diff --git a/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/550.rst b/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/550.rst
new file mode 100644
index 0000000000000000000000000000000000000000..73c718bc8bffecd15f0c93d1de6d1db848a062c1
--- /dev/null
+++ b/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/550.rst
@@ -0,0 +1,36 @@
+.. include:: /Includes.rst.txt
+
+formEditor.editors.550
+----------------------
+
+:aspect:`Option path`
+      TYPO3.CMS.Form.prototypes.<prototypeIdentifier>.formElementsDefinition.Number.formEditor.editors.550
+
+:aspect:`Data type`
+      array/ :ref:`[TextEditor] <typo3.cms.form.prototypes.\<prototypeidentifier>.formelementsdefinition.\<formelementtypeidentifier>.formeditor.editors.*.texteditor>`
+
+:aspect:`Needed by`
+      Backend (form editor)
+
+:aspect:`Mandatory`
+      Recommended
+
+.. :aspect:`Related options`
+      @ToDo
+
+:aspect:`Default value (for prototype 'standard')`
+      .. code-block:: yaml
+         :linenos:
+         :emphasize-lines: 4-
+
+         Number:
+           formEditor:
+             editors:
+               550:
+                 identifier: step
+                 templateName: Inspector-TextEditor
+                 label: formEditor.elements.TextMixin.editor.step.label
+                 propertyPath: properties.fluidAdditionalAttributes.step
+                 propertyValidators:
+                   10: Integer
+
diff --git a/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/700.rst b/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/700.rst
index 433dfeb5e26fbc4988d1095c2fb984f3d0a27d47..7e8ed881818b63266dc0d78e01f608b5c4f45319 100644
--- a/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/700.rst
+++ b/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/700.rst
@@ -7,7 +7,7 @@ formEditor.editors.700
       TYPO3.CMS.Form.prototypes.<prototypeIdentifier>.formElementsDefinition.Number.formEditor.editors.700
 
 :aspect:`Data type`
-      array/ :ref:`[TextEditor] <typo3.cms.form.prototypes.\<prototypeidentifier>.formelementsdefinition.\<formelementtypeidentifier>.formeditor.editors.*.texteditor>`
+      array/ :ref:`[GridColumnViewPortConfigurationEditor] <typo3.cms.form.prototypes.\<prototypeidentifier>.formelementsdefinition.\<formelementtypeidentifier>.formeditor.editors.*.gridcolumnviewportconfigurationeditor>`
 
 :aspect:`Needed by`
       Backend (form editor)
@@ -27,10 +27,25 @@ formEditor.editors.700
            formEditor:
              editors:
                700:
-                 identifier: step
-                 templateName: Inspector-TextEditor
-                 label: formEditor.elements.TextMixin.editor.step.label
-                 propertyPath: properties.fluidAdditionalAttributes.step
-                 propertyValidators:
-                   10: Integer
+                 identifier: gridColumnViewPortConfiguration
+                 templateName: Inspector-GridColumnViewPortConfigurationEditor
+                 label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.label
+                 configurationOptions:
+                   viewPorts:
+                     10:
+                       viewPortIdentifier: xs
+                       label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.xs.label
+                     20:
+                       viewPortIdentifier: sm
+                       label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.sm.label
+                     30:
+                       viewPortIdentifier: md
+                       label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.md.label
+                     40:
+                       viewPortIdentifier: lg
+                       label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.lg.label
+                   numbersOfColumnsToUse:
+                     label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.numbersOfColumnsToUse.label
+                     propertyPath: 'properties.gridColumnClassAutoConfiguration.viewPorts.{@viewPortIdentifier}.numbersOfColumnsToUse'
+                     fieldExplanationText: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.numbersOfColumnsToUse.fieldExplanationText