diff --git a/bundles/core/src/main/java/com/adobe/cq/forms/core/components/models/aemform/package-info.java b/bundles/core/src/main/java/com/adobe/cq/forms/core/components/models/aemform/package-info.java
index 5ff14cbbdc..508e781720 100644
--- a/bundles/core/src/main/java/com/adobe/cq/forms/core/components/models/aemform/package-info.java
+++ b/bundles/core/src/main/java/com/adobe/cq/forms/core/components/models/aemform/package-info.java
@@ -10,7 +10,7 @@
  *
  ******************************************************************************/
 
-@Version("1.4.0")
+@Version("1.5.0")
 package com.adobe.cq.forms.core.components.models.aemform;
 
 import org.osgi.annotation.versioning.Version;
\ No newline at end of file
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/textinput/text-area-dir/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/textinput/text-area-dir/.content.xml
new file mode 100755
index 0000000000..b67a96a38d
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/textinput/text-area-dir/.content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
+    jcr:primaryType="dam:Asset">
+    <jcr:content
+        cq:conf="\0"
+        jcr:lastModified="{Date}2024-06-06T15:28:49.467+05:30"
+        jcr:primaryType="dam:AssetContent"
+        sling:resourceType="fd/fm/af/render"
+        guide="1"
+        type="guide">
+        <metadata
+            fd:version="2.1"
+            jcr:language="en"
+            jcr:primaryType="nt:unstructured"
+            xmp:CreatorTool="AEM Forms AF Wizard"
+            allowedRenderFormat="HTML"
+            author="admin"
+            dorType="none"
+            formmodel="none"
+            themeRef="/libs/fd/af/themes/canvas"
+            title="text-area-dir"/>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/textinput/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/textinput/basic/.content.xml
index 547de8cef3..9ecc7536b4 100644
--- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/textinput/basic/.content.xml
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/textinput/basic/.content.xml
@@ -215,4 +215,4 @@
             </textinput_1477533951>
         </guideContainer>
     </jcr:content>
-</jcr:root>
+</jcr:root>
\ No newline at end of file
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/textinput/text-area-dir/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/textinput/text-area-dir/.content.xml
new file mode 100755
index 0000000000..e62fbbd5b2
--- /dev/null
+++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/textinput/text-area-dir/.content.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
+    jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:deviceGroups="[/etc/mobile/groups/responsive]"
+        cq:lastModified="{Date}2024-06-06T15:28:49.469+05:30"
+        cq:lastModifiedBy="admin"
+        cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
+        jcr:language="en"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="text-area-dir"
+        sling:configRef="/conf/forms/core-components-it/samples/textinput/text-area-dir/"
+        sling:resourceType="forms-components-examples/components/page">
+        <guideContainer
+            fd:version="2.1"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="forms-components-examples/components/form/container"
+            dorType="none"
+            fieldType="form"
+            thankYouOption="page"
+            themeRef="/libs/fd/af/themes/canvas"
+            title="text-area-dir">
+            <textinput
+                jcr:created="{Date}2024-06-06T15:28:43.776+05:30"
+                jcr:createdBy="admin"
+                jcr:lastModified="{Date}2024-06-06T15:28:49.446+05:30"
+                jcr:lastModifiedBy="admin"
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Text Input"
+                sling:resourceType="forms-components-examples/components/form/textinput"
+                enabled="{Boolean}true"
+                fieldType="text-input"
+                hideTitle="false"
+                multiLine="true"
+                name="textinput1717667924141"
+                readOnly="{Boolean}false"
+                textIsRich="[true,true,true]"
+                unboundFormElement="{Boolean}false"
+                visible="{Boolean}true"/>
+        </guideContainer>
+    </jcr:content>
+</jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/textinput.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/textinput.html
index 23e41392be..ebf4835dad 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/textinput.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/textinput.html
@@ -48,7 +48,8 @@
               placeholder="${text.placeHolder}"
               autocomplete="${text.autoComplete}"
               minlength="${text.minLength}"
-              maxlength="${text.maxLength}"></textarea>
+              maxlength="${text.maxLength}"
+              dir="auto"></textarea>
     <input data-sly-test="${!useTextarea}"
            title="${text.tooltipVisible ? '' : text.tooltipText}"
            class="cmp-adaptiveform-textinput__widget"