diff --git a/config/alfresco/messages/webclient_it.properties b/config/alfresco/messages/webclient_it.properties
index 9b1ecbeb22..2bb0c6854d 100755
--- a/config/alfresco/messages/webclient_it.properties
+++ b/config/alfresco/messages/webclient_it.properties
@@ -1821,7 +1821,7 @@ current_repo_people=Persone Alfresco attuali
 toggle_options=Opzioni di toggle
 no_results=Nessun risultato
 of=di
-failed_gen_url=Impossibile generare l'URL per il motore di ricerca '{0}'.\\n\\n\u00c8 probabile che manchino alcuni parametri richiesti. Verificare l'URL modello per il motore di ricerca.
+failed_gen_url=Impossibile generare l''URL per il motore di ricerca '{0}'.\\n\\n\u00c8 probabile che manchino alcuni parametri richiesti. Verificare l''URL modello per il motore di ricerca.
 failed_search=Impossibile recuperare i risultati della ricerca per '{0}'
 
 # UI Page Titles
diff --git a/source/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java b/source/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java
index 5239da1cbe..ae4bb049b0 100644
--- a/source/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java
+++ b/source/java/org/alfresco/web/bean/spaces/InviteSpaceUsersWizard.java
@@ -35,18 +35,11 @@ public class InviteSpaceUsersWizard extends BaseInviteUsersWizard
 {
    private static final long serialVersionUID = -1584891656721183347L;
    
-   /** Cache of available folder permissions */
-   Set<String> folderPermissions = null;
-   
    @Override
    protected Set<String> getPermissionsForType()
    {
-      if (this.folderPermissions == null)
-      {
-         this.folderPermissions = this.permissionService.getSettablePermissions(getNode().getType());
-      }
-       
-      return this.folderPermissions;
+      // Let the permission service do the caching to allow for dynamic model updates, etc.
+      return this.permissionService.getSettablePermissions(getNode().getType());
    }
 
    @Override
diff --git a/source/java/org/alfresco/web/bean/wcm/InviteWebsiteUsersWizard.java b/source/java/org/alfresco/web/bean/wcm/InviteWebsiteUsersWizard.java
index ce87287f33..679dc216be 100644
--- a/source/java/org/alfresco/web/bean/wcm/InviteWebsiteUsersWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/InviteWebsiteUsersWizard.java
@@ -42,9 +42,6 @@ public class InviteWebsiteUsersWizard extends BaseInviteUsersWizard
 {
    private static final long serialVersionUID = -8128781845465773847L;
 
-   /** Cache of available folder permissions */
-   Set<String> folderPermissions = null;
-   
    /** the node representing the website */
    private Node website;
    
@@ -147,13 +144,8 @@ public class InviteWebsiteUsersWizard extends BaseInviteUsersWizard
    @Override
    protected Set<String> getPermissionsForType()
    {
-      if (this.folderPermissions == null)
-      {
-         // get permissions and roles for a website folder type
-         this.folderPermissions = this.getPermissionService().getSettablePermissions(WCMAppModel.TYPE_AVMWEBFOLDER);
-      }
-       
-      return this.folderPermissions;
+      // Let the permission service do the caching to allow for dynamic model updates, etc.
+      return this.permissionService.getSettablePermissions(WCMAppModel.TYPE_AVMWEBFOLDER);
    }
 
    protected void setNode(Node node)
diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
index 422a59f441..4ee997dccf 100644
--- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
+++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
@@ -203,6 +203,7 @@ public class Schema2XForms implements Serializable
       importedSchemaDocumentElement.setAttributeNS(null, "id", "schema-1");
 
       NodeList nl = importedSchemaDocumentElement.getChildNodes();
+      boolean hasExternalSchema = false;
       
       for (int i = 0; i < nl.getLength(); i++)
       {
@@ -212,12 +213,17 @@ public class Schema2XForms implements Serializable
               String localName = current.getLocalName();
               if (localName.equals("include") || localName.equals("import"))
               {
-                  importedSchemaDocumentElement.removeChild(current);
+                  hasExternalSchema = true;
+				  break;
               }
           }
       }
 
-      modelSection.appendChild(importedSchemaDocumentElement);
+      // ALF-8105 / ETWOTWO-1384: Only embed the schema if it does not reference externals
+      if (!hasExternalSchema)
+      {
+          modelSection.appendChild(importedSchemaDocumentElement);
+      }
 
       //check if target namespace
       final StringList schemaNamespaces = schema.getNamespaces();
diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js
index 567479d70c..5d41b6ef58 100644
--- a/source/web/scripts/ajax/xforms.js
+++ b/source/web/scripts/ajax/xforms.js
@@ -127,10 +127,6 @@ alfresco.xforms.Widget = new Class({
       {
         this.hideAlert();
       }
-      else
-      {
-        this.showAlert();
-      }
   },
 
   /** Sets the widget's valid state, as indicated by an XFormsEvent */