diff --git a/source/java/org/alfresco/web/forms/ServletContextFormDataFunctionsAdapter.java b/source/java/org/alfresco/web/forms/ServletContextFormDataFunctionsAdapter.java
index f1f3c9790e..0a01f4a092 100644
--- a/source/java/org/alfresco/web/forms/ServletContextFormDataFunctionsAdapter.java
+++ b/source/java/org/alfresco/web/forms/ServletContextFormDataFunctionsAdapter.java
@@ -17,6 +17,7 @@
 package org.alfresco.web.forms;
 
 import org.alfresco.jndi.AVMFileDirContext;
+import org.alfresco.util.JNDIPath;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 import javax.servlet.ServletContext;
@@ -39,13 +40,22 @@ public class ServletContextFormDataFunctionsAdapter
    {
       // The real_path will look something like this:
       //   /alfresco.avm/avm.alfresco.localhost/$-1$alfreco-guest-main:/www/avm_webapps/my_webapp
+      System.err.println("looking up real path for " + path);
       path = this.servletContext.getRealPath(path);
-      
-      // The avm_path to the root of the context will look something like this:
-      //    alfreco-guest-main:/www/avm_webapps/my_webapp
-      path = path.substring(path.indexOf('$', path.indexOf('$') + 1)  + 1);
-      path = path.replace('\\','/');
-      return path;
+      System.err.println("got real path " + path);
+      try
+      {
+         final JNDIPath jndiPath = new JNDIPath(AVMFileDirContext.getAVMFileDirAppBase(), path);
+         // The avm_path to the root of the context will look something like this:
+         //    alfreco-guest-main:/www/avm_webapps/my_webapp
+         
+         return jndiPath.getAvmPath();
+      }
+      catch (Exception e)
+      {
+         System.err.println(e.getMessage());
+         return path;
+      }
    }
 
    public Document parseXMLDocument(final String path)
diff --git a/source/test-resources/xforms/demos/press-release/press-release-plain-text.ftl b/source/test-resources/xforms/demos/press-release/press-release-plain-text.ftl
index e88481d403..776362fa73 100644
--- a/source/test-resources/xforms/demos/press-release/press-release-plain-text.ftl
+++ b/source/test-resources/xforms/demos/press-release/press-release-plain-text.ftl
@@ -16,7 +16,7 @@ ${press_release.location}--${press_release.launch_date}--
 ${body?trim}
 </#list>
 <#list press_release.include_company_footer as cf>
-<#assign cf_document=alfresco.parseXMLDocument(cf)>
+<#assign cf_document=alf.parseXMLDocument(cf)>
 
 <@show_heading heading="About ${cf_document.name}"/>
   <#list cf_document.body as body>
diff --git a/source/test-resources/xforms/demos/press-release/press-release.xsl b/source/test-resources/xforms/demos/press-release/press-release.xsl
index a7d99f2693..80486466e7 100644
--- a/source/test-resources/xforms/demos/press-release/press-release.xsl
+++ b/source/test-resources/xforms/demos/press-release/press-release.xsl
@@ -65,7 +65,7 @@ Produces an html rendition of a press release
 	    <xsl:for-each select="/pr:press_release/pr:include_company_footer">
               <xsl:variable name="cf-id"><xsl:value-of select="."/></xsl:variable>
 	      <!-- load the xml document for the company footer using a built in FormDataFunction -->
-	      <xsl:variable name="cf" select="alfresco:parseXMLDocument($cf-id)"/>
+	      <xsl:variable name="cf" select="alf:parseXMLDocument($cf-id)"/>
               <h2>About <xsl:value-of select="$cf/pr:name"/></h2>
 	      <xsl:for-each select="$cf/pr:body">
 		<p><xsl:value-of select="." disable-output-escaping="yes"/></p>
@@ -79,7 +79,7 @@ Produces an html rendition of a press release
 	    <!-- END MAIN CONTENT -->
 	    <xsl:element name="a">
 	      <xsl:attribute name="href">
-		<xsl:value-of select="fn:replaceAll(string($alfresco:form_instance_data_file_name), '.xml', '.txt')"/>
+		<xsl:value-of select="fn:replaceAll(string($alf:form_instance_data_file_name), '.xml', '.txt')"/>
 	      </xsl:attribute>
 	      <xsl:text>view plain text version</xsl:text>
 	    </xsl:element>
@@ -97,7 +97,7 @@ Produces an html rendition of a press release
 			    select="/pr:press_release/pr:title"/>
 	      <!-- load all press releases into a variable by calling into a form data function -->
 	      <xsl:variable name="all_press_releases" 
-			    select="alfresco:parseXMLDocuments('press-release')"/>
+			    select="alf:parseXMLDocuments('press-release')"/>
 	      <ul>
 		<!-- select a unique set of categories for the first level navigation -->
 		<xsl:for-each select="$all_press_releases[not(pr:category=preceding-sibling::pr:press_release/pr:category)]">
@@ -117,7 +117,7 @@ Produces an html rendition of a press release
 				  <xsl:attribute name="style">font-weight:bold;</xsl:attribute>
 				</xsl:if>
 				<xsl:attribute name="href">
-				  <xsl:value-of select="fn:replaceAll(string(@alfresco:file_name), '.xml', '.html')"/>
+				  <xsl:value-of select="fn:replaceAll(string(@alf:file_name), '.xml', '.html')"/>
 				</xsl:attribute>
 				<xsl:value-of select="pr:title"/>
 			      </xsl:element>
@@ -132,7 +132,7 @@ Produces an html rendition of a press release
 			-->
 			<xsl:element name="a">
 			  <xsl:attribute name="href">
-			    <xsl:value-of select="fn:replaceAll(string(@alfresco:file_name), '.xml', '.html')"/>
+			    <xsl:value-of select="fn:replaceAll(string(@alf:file_name), '.xml', '.html')"/>
 			  </xsl:attribute>
 			  <xsl:value-of select="pr:category"/>
 			</xsl:element>
diff --git a/source/test-resources/xforms/unit-tests/repeat-tests/repeat-textarea.xsd b/source/test-resources/xforms/unit-tests/repeat-tests/repeat-textarea.xsd
new file mode 100644
index 0000000000..bd67e93a7c
--- /dev/null
+++ b/source/test-resources/xforms/unit-tests/repeat-tests/repeat-textarea.xsd
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified">
+  <xs:element name="repeat-textarea">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="zero-to-one" type="xs:anyType" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="one-to-one" type="xs:anyType" minOccurs="1" maxOccurs="1"/>
+        <xs:element name="one-to-inf" type="xs:anyType" minOccurs="1" maxOccurs="unbounded"/>
+        <xs:element name="zero-to-inf" type="xs:anyType" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>