diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
index 29e7796ab1..764ee4730b 100644
--- a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
+++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
@@ -1654,6 +1654,13 @@
         </column>
       </columns>
       <primarykey name="alf_node_assoc_pkey">
+        <validators>
+            <validator class="org.alfresco.util.schemacomp.validator.NameValidator">
+              <properties>
+                <property name="pattern">alf_node_assoc_pkey1?</property>
+              </properties>
+            </validator>
+        </validators>
         <columnnames>
           <columnname order="1">id</columnname>
         </columnnames>
diff --git a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-AVM.xml b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-AVM.xml
index 1123aca8f9..8e23e6fbe2 100644
--- a/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-AVM.xml
+++ b/config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-AVM.xml
@@ -81,6 +81,13 @@
         </column>
       </columns>
       <primarykey name="avm_child_entries_pkey">
+        <validators>
+          <validator class="org.alfresco.util.schemacomp.validator.NameValidator">
+            <properties>
+              <property name="pattern">.*</property>
+            </properties>
+          </validator>
+        </validators>
         <columnnames>
           <columnname order="1">parent_id</columnname>
           <columnname order="2">lc_name</columnname>
diff --git a/config/alfresco/extension/ehcache-custom.xml.sample.cluster b/config/alfresco/extension/ehcache-custom.xml.sample.cluster
index a63fbc7e38..759d3f6739 100644
--- a/config/alfresco/extension/ehcache-custom.xml.sample.cluster
+++ b/config/alfresco/extension/ehcache-custom.xml.sample.cluster
@@ -151,14 +151,8 @@
         overflowToDisk="false"
         statistics="false"
         >
-
-            <cacheEventListenerFactory
-                    class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
-                    properties="replicatePuts = false,
-                                replicateUpdates = true,
-                                replicateRemovals = true,
-                                replicateUpdatesViaCopy = false,
-                                replicateAsynchronously = false"/>
+        
+        <!-- We are intentionally not replicating this secondary cache and validating in the code --> 
     </cache>
 
     <cache
@@ -171,13 +165,7 @@
         statistics="false"
         >
 
-            <cacheEventListenerFactory
-                    class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
-                    properties="replicatePuts = false,
-                                replicateUpdates = true,
-                                replicateRemovals = true,
-                                replicateUpdatesViaCopy = false,
-                                replicateAsynchronously = false"/>
+        <!-- We are intentionally not replicating this secondary cache and validating in the code --> 
     </cache>
 
     <cache
@@ -188,13 +176,7 @@
         statistics="false"
         >
 
-            <cacheEventListenerFactory
-                    class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
-                    properties="replicatePuts = false,
-                                replicateUpdates = true,
-                                replicateRemovals = true,
-                                replicateUpdatesViaCopy = false,
-                                replicateAsynchronously = false"/>
+        <!-- We are intentionally not replicating this secondary cache and validating in the code --> 
     </cache>
 
     <cache
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 9c6718c4ac..1d8a1ef303 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -525,7 +525,7 @@ home.folder.creation.eager=true
 # Should we consider zero byte content to be the same as no content when firing
 # content update policies? Prevents 'premature' firing of inbound content rules
 # for some clients such as Mac OS X Finder
-policy.content.update.ignoreEmpty=false
+policy.content.update.ignoreEmpty=true
 
 # The well known RMI registry port and external host name published in the stubs
 # is defined in the alfresco-shared.properties file
diff --git a/source/java/org/alfresco/repo/rule/ruletrigger/CreateNodeRuleTrigger.java b/source/java/org/alfresco/repo/rule/ruletrigger/CreateNodeRuleTrigger.java
index 11ac2cd048..900138b622 100644
--- a/source/java/org/alfresco/repo/rule/ruletrigger/CreateNodeRuleTrigger.java
+++ b/source/java/org/alfresco/repo/rule/ruletrigger/CreateNodeRuleTrigger.java
@@ -25,6 +25,8 @@ import org.alfresco.repo.policy.JavaBehaviour;
 import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
 import org.alfresco.repo.rule.RuntimeRuleService;
 import org.alfresco.repo.transaction.TransactionalResourceHelper;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
@@ -120,6 +122,18 @@ public class CreateNodeRuleTrigger extends RuleTriggerAbstractBase
         }
         NodeRef nodeRef = childAssocRef.getChildRef();
 
+        // If the node has a single-valued content property, don't fire the trigger, as it will be handled by
+        // on-content-create-trigger, according to its settings for empty content
+        for (QName propertyQName : nodeService.getProperties(nodeRef).keySet())
+        {
+            PropertyDefinition propertyDef = dictionaryService.getProperty(propertyQName);
+            if (propertyDef != null && propertyDef.getDataType().getName().equals(DataTypeDefinition.CONTENT)
+                    && !propertyDef.isMultiValued())
+            {
+                return;
+            }
+        }
+
         // Keep track of new nodes to prevent firing of updates in the same transaction
         Set<NodeRef> newNodeRefSet = TransactionalResourceHelper.getSet(RULE_TRIGGER_NEW_NODES);
         newNodeRefSet.add(nodeRef);