Index: cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
===================================================================
--- cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	(revision 108930)
+++ cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	(working copy)
@@ -72,8 +72,11 @@
                    view_bundling="true"                   
                    view_ack_collection_timeout="5000"
                    resume_task_timeout="7500"/>
-          <FC max_credits="2000000" min_threshold="0.10" 
+          <UFC max_credits="2000000" min_threshold="0.10" 
               ignore_synchronous_response="true"/>
+          <MFC max_credits="2000000" min_threshold="0.10" 
+              ignore_synchronous_response="true"/>
+
           <FRAG2 frag_size="60000"/>
           <pbcast.STREAMING_STATE_TRANSFER/>
           <!--pbcast.STATE_TRANSFER/-->
@@ -142,8 +145,10 @@
                    view_bundling="true"
                    view_ack_collection_timeout="5000"
                    resume_task_timeout="7500"/>
-          <FC max_credits="2000000" min_threshold="0.10" 
+          <UFC max_credits="2000000" min_threshold="0.10" 
               ignore_synchronous_response="true"/>
+          <MFC max_credits="2000000" min_threshold="0.10" 
+              ignore_synchronous_response="true"/>
           <FRAG2 frag_size="60000"/>
           <pbcast.STREAMING_STATE_TRANSFER/>
           <!--pbcast.STATE_TRANSFER/-->
@@ -286,8 +291,8 @@
                         view_bundling="true"
                         view_ack_collection_timeout="5000"
                         resume_task_timeout="7500"/>
-            <FC max_credits="2000000" min_threshold="0.10" 
-                ignore_synchronous_response="true"/>
+            <UFC max_credits="2000000"/>
+            <MFC max_credits="2000000"/>
             <FRAG2 frag_size="60000"/>
             <pbcast.STREAMING_STATE_TRANSFER/>
             <!--pbcast.STATE_TRANSFER/-->
Index: testsuite/src/resources/cluster/ejb2/passexp/META-INF/passexp-stacks.xml
===================================================================
--- testsuite/src/resources/cluster/ejb2/passexp/META-INF/passexp-stacks.xml	(revision 108930)
+++ testsuite/src/resources/cluster/ejb2/passexp/META-INF/passexp-stacks.xml	(working copy)
@@ -56,7 +56,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -128,7 +129,8 @@
                         shun="true"
                         view_bundling="true"
                         view_ack_collection_timeout="5000"/>
-            <FC max_credits="2000000" min_threshold="0.10"/>
+            <UFC max_credits="2000000"/>
+            <MFC max_credits="2000000"/>
             <FRAG2 frag_size="60000"/>
             <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
             <pbcast.STATE_TRANSFER/>
Index: testsuite/src/resources/cluster/drm/drm-test-stacks.xml
===================================================================
--- testsuite/src/resources/cluster/drm/drm-test-stacks.xml	(revision 108930)
+++ testsuite/src/resources/cluster/drm/drm-test-stacks.xml	(working copy)
@@ -27,7 +27,8 @@
                         shun="false"
                         view_bundling="true"
                         view_ack_collection_timeout="5000"/>
-            <FC max_credits="2000000" min_threshold="0.10"/>
+            <UFC max_credits="2000000"/>
+            <MFC max_credits="2000000"/>
             <FRAG2 frag_size="60000"/>
             <pbcast.STATE_TRANSFER/>
             <pbcast.FLUSH timeout="0"/>
@@ -57,7 +58,8 @@
                         shun="false"
                         view_bundling="true"
                         view_ack_collection_timeout="5000"/>
-            <FC max_credits="2000000" min_threshold="0.10"/>
+            <UFC max_credits="2000000"/>
+            <MFC max_credits="2000000"/>
             <FRAG2 frag_size="60000"/>
             <pbcast.STATE_TRANSFER/>
             <pbcast.FLUSH timeout="0"/>
Index: testsuite/src/resources/cluster/cachemanager/stacks.xml
===================================================================
--- testsuite/src/resources/cluster/cachemanager/stacks.xml	(revision 108930)
+++ testsuite/src/resources/cluster/cachemanager/stacks.xml	(working copy)
@@ -52,7 +52,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
Index: testsuite/src/resources/cluster/channelfactory/stacks.xml
===================================================================
--- testsuite/src/resources/cluster/channelfactory/stacks.xml	(revision 108930)
+++ testsuite/src/resources/cluster/channelfactory/stacks.xml	(working copy)
@@ -56,7 +56,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -116,7 +117,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -175,7 +177,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -234,7 +237,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -284,7 +288,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -332,7 +337,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>
@@ -391,7 +397,8 @@
                    shun="true"
                    view_bundling="true"
                    view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" min_threshold="0.10"/>
+          <UFC max_credits="2000000"/>
+          <MFC max_credits="2000000"/>
           <FRAG2 frag_size="60000"/>
           <!-- pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/ -->
           <pbcast.STATE_TRANSFER/>