ICE-6170 - fixed behavior of batch requests

author: Benoit Foucher <benoit@zeroc.com> 2015-03-10 12:12:10 +0100
committer: Benoit Foucher <benoit@zeroc.com> 2015-03-10 12:12:10 +0100
commit: c6ca68d97aa5bbc2a172e3e35171b5452657fa22 (patch)
tree: 46edcca4c8e313285a205bf6fad7c56c452c0cc0 /cpp/src
parent: Minor JS style fixes (diff)
download: ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.tar.bz2
ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.tar.xz
ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.zip
48 files changed, 1710 insertions, 1436 deletions
diff --git a/cpp/src/Freeze/.depend.mak b/cpp/src/Freeze/.depend.mak
index c8ee9ff06be..35ce4156afa 100755
--- a/cpp/src/Freeze/.depend.mak
+++ b/cpp/src/Freeze/.depend.mak
@@ -124,6 +124,7 @@ BackgroundSaveEvictorI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\InstanceF.h" \
@@ -145,6 +146,7 @@ BackgroundSaveEvictorI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -281,6 +283,7 @@ Catalog.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -288,6 +291,7 @@ Catalog.obj: \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -406,6 +410,7 @@ CatalogIndexList.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -413,6 +418,7 @@ CatalogIndexList.obj: \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -517,6 +523,7 @@ ConnectionI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -538,6 +545,7 @@ ConnectionI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -654,6 +662,7 @@ EvictorI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\InstanceF.h" \
@@ -675,6 +684,7 @@ EvictorI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -794,6 +804,7 @@ EvictorIteratorI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -816,6 +827,7 @@ EvictorIteratorI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -943,6 +955,7 @@ Index.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -965,6 +978,7 @@ Index.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1092,6 +1106,7 @@ IndexI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1114,6 +1129,7 @@ IndexI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1247,6 +1263,7 @@ MapDb.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1268,6 +1285,7 @@ MapDb.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1378,6 +1396,7 @@ MapI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1400,6 +1419,7 @@ MapI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1515,6 +1535,7 @@ ObjectStore.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1537,6 +1558,7 @@ ObjectStore.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1667,6 +1689,7 @@ SharedDbEnv.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1689,6 +1712,7 @@ SharedDbEnv.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1821,6 +1845,7 @@ TransactionalEvictorContext.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1843,6 +1868,7 @@ TransactionalEvictorContext.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1984,6 +2010,7 @@ TransactionalEvictorI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\InstanceF.h" \
@@ -2005,6 +2032,7 @@ TransactionalEvictorI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -2160,6 +2188,7 @@ TransactionI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -2181,6 +2210,7 @@ TransactionI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -2285,6 +2315,7 @@ Util.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -2307,6 +2338,7 @@ Util.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -2842,6 +2874,7 @@ PingObject.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
diff --git a/cpp/src/FreezeScript/.depend.mak b/cpp/src/FreezeScript/.depend.mak
index 3cee24b8da9..8c3f572f42c 100755
--- a/cpp/src/FreezeScript/.depend.mak
+++ b/cpp/src/FreezeScript/.depend.mak
@@ -51,6 +51,7 @@ AssignVisitor.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -73,6 +74,7 @@ AssignVisitor.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -174,6 +176,7 @@ Data.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -196,6 +199,7 @@ Data.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -295,6 +299,7 @@ Error.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -321,6 +326,7 @@ Error.obj: \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Freeze\CatalogData.h" \
 
 Functions.obj: \
@@ -375,6 +381,7 @@ Functions.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -397,6 +404,7 @@ Functions.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -506,6 +514,7 @@ Parser.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -528,6 +537,7 @@ Parser.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -628,6 +638,7 @@ Print.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -650,6 +661,7 @@ Print.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -746,6 +758,7 @@ Util.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -772,6 +785,7 @@ Util.obj: \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Freeze\CatalogData.h" \
     "Exception.h" \
     "$(includedir)\Freeze\Catalog.h" \
@@ -885,6 +899,7 @@ Grammar.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -907,6 +922,7 @@ Grammar.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1008,6 +1024,7 @@ Scanner.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1030,6 +1047,7 @@ Scanner.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1127,6 +1145,7 @@ TransformAnalyzer.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1153,6 +1172,7 @@ TransformAnalyzer.obj: \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Freeze\CatalogData.h" \
 
 TransformVisitor.obj: \
@@ -1207,6 +1227,7 @@ TransformVisitor.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1229,6 +1250,7 @@ TransformVisitor.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1330,6 +1352,7 @@ Transformer.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1352,6 +1375,7 @@ Transformer.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1471,6 +1495,7 @@ transformdb.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1493,6 +1518,7 @@ transformdb.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1612,6 +1638,7 @@ DumpDescriptors.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1634,6 +1661,7 @@ DumpDescriptors.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1742,6 +1770,7 @@ DumpDB.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1764,6 +1793,7 @@ DumpDB.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
diff --git a/cpp/src/Glacier2/.depend.mak b/cpp/src/Glacier2/.depend.mak
index 695dbdf41ad..64d24bca609 100755
--- a/cpp/src/Glacier2/.depend.mak
+++ b/cpp/src/Glacier2/.depend.mak
@@ -60,6 +60,7 @@ Blobject.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -82,6 +83,7 @@ Blobject.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -191,6 +193,7 @@ ClientBlobject.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -213,6 +216,7 @@ ClientBlobject.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -311,6 +315,7 @@ FilterI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -398,6 +403,7 @@ FilterManager.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -460,6 +466,7 @@ FilterManager.obj: \
     "$(includedir)\Ice\Plugin.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
     "$(includedir)\Ice\RemoteLogger.h" \
@@ -554,6 +561,7 @@ Glacier2Router.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -576,6 +584,7 @@ Glacier2Router.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -689,6 +698,7 @@ Instance.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -711,6 +721,7 @@ Instance.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -821,6 +832,7 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -863,6 +875,7 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\MetricsFunctional.h" \
     "Instrumentation.h" \
     "$(includedir)\Glacier2\Metrics.h" \
@@ -929,6 +942,7 @@ ProxyVerifier.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -951,6 +965,7 @@ ProxyVerifier.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1047,6 +1062,7 @@ RequestQueue.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1069,6 +1085,7 @@ RequestQueue.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1167,6 +1184,7 @@ RouterI.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1201,6 +1219,7 @@ RouterI.obj: \
     "$(includedir)\IceUtil\Timer.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1313,6 +1332,7 @@ RoutingTable.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1335,6 +1355,7 @@ RoutingTable.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1434,6 +1455,7 @@ ServerBlobject.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1456,6 +1478,7 @@ ServerBlobject.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1565,6 +1588,7 @@ SessionRouterI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1587,6 +1611,7 @@ SessionRouterI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak
index 12621e79a97..c5b11b96f0a 100755
--- a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak
@@ -37,6 +37,7 @@ CryptPermissionsVerifierI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -91,6 +92,7 @@ CryptPermissionsVerifierI.obj: \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
diff --git a/cpp/src/Glacier2Lib/.depend.mak b/cpp/src/Glacier2Lib/.depend.mak
index dcdcec2bf50..9e08907c161 100755
--- a/cpp/src/Glacier2Lib/.depend.mak
+++ b/cpp/src/Glacier2Lib/.depend.mak
@@ -86,6 +86,7 @@ Application.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -108,6 +109,7 @@ Application.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -203,6 +205,7 @@ NullPermissionsVerifier.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -250,6 +253,7 @@ NullPermissionsVerifier.obj: \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -332,6 +336,7 @@ SessionHelper.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -358,6 +363,7 @@ SessionHelper.obj: \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
@@ -455,6 +461,7 @@ Metrics.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -536,6 +543,7 @@ PermissionsVerifierF.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -599,6 +607,7 @@ PermissionsVerifier.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -681,6 +690,7 @@ Router.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -767,6 +777,7 @@ RouterF.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -830,6 +841,7 @@ Session.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak
index 4deb806f714..5252a359fc4 100755
--- a/cpp/src/Ice/.depend.mak
+++ b/cpp/src/Ice/.depend.mak
@@ -230,6 +230,7 @@ Acceptor.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -301,6 +302,7 @@ ACM.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
@@ -373,6 +375,7 @@ ACM.obj: \
     "$(includedir)\Ice\DynamicLibraryF.h" \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\FacetMap.h" \
@@ -429,6 +432,7 @@ Application.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -451,6 +455,7 @@ Application.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -567,6 +572,7 @@ AsyncResult.obj: \
     "$(includedir)\Ice\ConnectionIF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "EventHandler.h" \
     "EventHandlerF.h" \
     "Network.h" \
@@ -598,6 +604,7 @@ AsyncResult.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -681,6 +688,7 @@ BasicStream.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -719,6 +727,7 @@ BasicStream.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -745,6 +754,115 @@ BasicStream.obj: \
     "$(includedir)\Ice\Logger.h" \
     "$(includedir)\Ice\SlicedData.h" \
 
+BatchRequestQueue.obj: \
+	BatchRequestQueue.cpp \
+    "BatchRequestQueue.h" \
+    "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(includedir)\IceUtil\Atomic.h" \
+    "$(includedir)\IceUtil\Mutex.h" \
+    "$(includedir)\IceUtil\Lock.h" \
+    "$(includedir)\IceUtil\ThreadException.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\IceUtil\Time.h" \
+    "$(includedir)\IceUtil\MutexProtocol.h" \
+    "$(includedir)\IceUtil\Monitor.h" \
+    "$(includedir)\IceUtil\Cond.h" \
+    "$(includedir)\IceUtil\UniquePtr.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
+    "$(includedir)\Ice\ProxyF.h" \
+    "$(includedir)\Ice\Config.h" \
+    "$(includedir)\Ice\ProxyHandle.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
+    "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\InstanceF.h" \
+    "$(includedir)\Ice\BasicStream.h" \
+    "$(includedir)\IceUtil\StringConverter.h" \
+    "$(includedir)\Ice\Object.h" \
+    "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\IncomingAsyncF.h" \
+    "$(includedir)\Ice\Current.h" \
+    "$(includedir)\IceUtil\PushDisableWarnings.h" \
+    "$(includedir)\Ice\Exception.h" \
+    "$(includedir)\Ice\Format.h" \
+    "$(includedir)\Ice\StreamF.h" \
+    "$(includedir)\Ice\LocalObject.h" \
+    "$(includedir)\Ice\LocalObjectF.h" \
+    "$(includedir)\Ice\StreamHelpers.h" \
+    "$(includedir)\IceUtil\ScopedArray.h" \
+    "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\IceUtil\Optional.h" \
+    "$(includedir)\Ice\ObjectAdapterF.h" \
+    "$(includedir)\IceUtil\UndefSysMacros.h" \
+    "$(includedir)\IceUtil\PopDisableWarnings.h" \
+    "$(includedir)\Ice\ConnectionF.h" \
+    "$(includedir)\Ice\Identity.h" \
+    "$(includedir)\Ice\Version.h" \
+    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
+    "$(includedir)\Ice\Buffer.h" \
+    "$(includedir)\Ice\Protocol.h" \
+    "$(includedir)\Ice\SlicedDataF.h" \
+    "$(includedir)\Ice\UserExceptionFactory.h" \
+    "$(includedir)\Ice\FactoryTable.h" \
+    "Instance.h" \
+    "$(includedir)\IceUtil\RecMutex.h" \
+    "$(includedir)\IceUtil\Timer.h" \
+    "$(includedir)\IceUtil\Thread.h" \
+    "$(includedir)\Ice\CommunicatorF.h" \
+    "$(includedir)\Ice\InstrumentationF.h" \
+    "TraceLevelsF.h" \
+    "DefaultsAndOverridesF.h" \
+    "RouterInfoF.h" \
+    "LocatorInfoF.h" \
+    "ReferenceFactoryF.h" \
+    "$(includedir)\Ice\ProxyFactoryF.h" \
+    "$(includedir)\Ice\ThreadPoolF.h" \
+    "$(includedir)\Ice\ConnectionFactoryF.h" \
+    "ACM.h" \
+    "$(includedir)\Ice\ACMF.h" \
+    "$(includedir)\Ice\Connection.h" \
+    "$(includedir)\Ice\Proxy.h" \
+    "$(includedir)\Ice\ConnectionIF.h" \
+    "$(includedir)\Ice\RequestHandlerF.h" \
+    "$(includedir)\Ice\EndpointF.h" \
+    "$(includedir)\Ice\EndpointTypes.h" \
+    "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\AsyncResult.h" \
+    "$(includedir)\Ice\AsyncResultF.h" \
+    "$(includedir)\Ice\ObserverHelper.h" \
+    "$(includedir)\Ice\Instrumentation.h" \
+    "$(includedir)\Ice\Endpoint.h" \
+    "$(includedir)\Ice\BuiltinSequences.h" \
+    "$(includedir)\Ice\PropertiesF.h" \
+    "$(includedir)\Ice\LoggerF.h" \
+    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
+    "EndpointFactoryManagerF.h" \
+    "IPEndpointIF.h" \
+    "RetryQueueF.h" \
+    "$(includedir)\Ice\DynamicLibraryF.h" \
+    "$(includedir)\Ice\PluginF.h" \
+    "NetworkF.h" \
+    "NetworkProxyF.h" \
+    "$(includedir)\Ice\Initialize.h" \
+    "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\Plugin.h" \
+    "ImplicitContextI.h" \
+    "$(includedir)\Ice\ImplicitContext.h" \
+    "$(includedir)\Ice\LocalException.h" \
+    "$(includedir)\Ice\FacetMap.h" \
+    "$(includedir)\Ice\Process.h" \
+    "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Incoming.h" \
+    "$(includedir)\Ice\ServantLocatorF.h" \
+    "$(includedir)\Ice\ServantManagerF.h" \
+    "$(includedir)\Ice\ResponseHandlerF.h" \
+    "$(includedir)\Ice\Properties.h" \
+    "$(includedir)\Ice\IncomingAsync.h" \
+    "$(includedir)\Ice\PropertiesAdmin.h" \
+
 Buffer.obj: \
 	Buffer.cpp \
     "$(includedir)\Ice\Buffer.h" \
@@ -844,6 +962,7 @@ CollocatedRequestHandler.obj: \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -879,6 +998,8 @@ CollocatedRequestHandler.obj: \
     "Reference.h" \
     "ReferenceFactoryF.h" \
     "$(includedir)\Ice\RouterF.h" \
+    "BatchRequestQueue.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -952,6 +1073,7 @@ CommunicatorI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -978,6 +1100,7 @@ CommunicatorI.obj: \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\Communicator.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
@@ -1034,6 +1157,7 @@ CommunicatorI.obj: \
     "EndpointI.h" \
     "ReferenceFactory.h" \
     "Reference.h" \
+    "BatchRequestQueue.h" \
     "SharedContext.h" \
     "ProxyFactory.h" \
     "ObjectFactoryManager.h" \
@@ -1096,6 +1220,7 @@ ConnectionFactory.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\InstanceF.h" \
@@ -1158,6 +1283,7 @@ ConnectionFactory.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\FacetMap.h" \
@@ -1184,6 +1310,7 @@ ConnectionFactory.obj: \
     "$(includedir)\Ice\LocatorF.h" \
     "Reference.h" \
     "$(includedir)\Ice\RouterF.h" \
+    "BatchRequestQueue.h" \
     "SharedContext.h" \
     "RouterInfo.h" \
     "$(includedir)\Ice\Functional.h" \
@@ -1238,6 +1365,7 @@ ConnectionI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\InstanceF.h" \
@@ -1299,6 +1427,7 @@ ConnectionI.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\FacetMap.h" \
@@ -1329,6 +1458,7 @@ ConnectionI.obj: \
     "ReferenceFactory.h" \
     "Reference.h" \
     "$(includedir)\Ice\RouterF.h" \
+    "BatchRequestQueue.h" \
     "SharedContext.h" \
     "ProxyFactory.h" \
 
@@ -1373,6 +1503,7 @@ ConnectionRequestHandler.obj: \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1403,6 +1534,8 @@ ConnectionRequestHandler.obj: \
     "$(includedir)\Ice\LocatorF.h" \
     "RouterInfoF.h" \
     "LocatorInfoF.h" \
+    "BatchRequestQueue.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1468,14 +1601,15 @@ ConnectRequestHandler.obj: \
     "$(includedir)\IceUtil\Cond.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\MutexProtocol.h" \
-    "RequestHandler.h" \
+    "$(includedir)\IceUtil\UniquePtr.h" \
+    "ConnectRequestHandlerF.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\Handle.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\Config.h" \
+    "RequestHandler.h" \
+    "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
     "$(includedir)\Ice\OutgoingAsyncF.h" \
     "$(includedir)\Ice\ProxyF.h" \
@@ -1504,6 +1638,7 @@ ConnectRequestHandler.obj: \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1527,6 +1662,8 @@ ConnectRequestHandler.obj: \
     "$(includedir)\Ice\LocatorF.h" \
     "RouterInfoF.h" \
     "LocatorInfoF.h" \
+    "BatchRequestQueue.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1629,6 +1766,7 @@ DefaultsAndOverrides.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1723,6 +1861,7 @@ DeprecatedStringConverter.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1745,6 +1884,7 @@ DeprecatedStringConverter.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "Instance.h" \
     "$(includedir)\IceUtil\RecMutex.h" \
     "TraceLevelsF.h" \
@@ -1915,6 +2055,7 @@ EndpointFactory.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1946,6 +2087,7 @@ EndpointFactory.obj: \
     "NetworkProxyF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -2046,6 +2188,7 @@ EndpointFactoryManager.obj: \
     "$(includedir)\Ice\ConnectionIF.h" \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -2061,6 +2204,7 @@ EndpointFactoryManager.obj: \
     "NetworkProxyF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\FacetMap.h" \
@@ -2173,6 +2317,7 @@ EventHandler.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -2208,6 +2353,7 @@ EventHandler.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -2265,6 +2411,7 @@ Exception.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -2572,6 +2719,7 @@ Incoming.obj: \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -2626,6 +2774,7 @@ Incoming.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\Process.h" \
@@ -2708,6 +2857,7 @@ IncomingAsync.obj: \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
     "$(includedir)\Ice\Endpoint.h" \
@@ -2749,6 +2899,7 @@ IncomingAsync.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\FacetMap.h" \
@@ -2808,6 +2959,7 @@ Initialize.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -2834,6 +2986,7 @@ Initialize.obj: \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\Communicator.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
@@ -2938,6 +3091,7 @@ Instance.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -2972,6 +3126,7 @@ Instance.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -3001,6 +3156,7 @@ Instance.obj: \
     "$(includedir)\Ice\ProcessF.h" \
     "ReferenceFactory.h" \
     "Reference.h" \
+    "BatchRequestQueue.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
@@ -3039,6 +3195,7 @@ Instance.obj: \
     "EndpointFactory.h" \
     "ProtocolInstance.h" \
     "RequestHandlerFactory.h" \
+    "ConnectRequestHandlerF.h" \
     "RetryQueue.h" \
     "$(includedir)\Ice\DynamicLibrary.h" \
     "PluginManagerI.h" \
@@ -3102,6 +3259,7 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -3144,6 +3302,7 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\MetricsFunctional.h" \
     "$(includedir)\Ice\ObjectAdapter.h" \
     "$(includedir)\Ice\LocatorF.h" \
@@ -3210,6 +3369,7 @@ IPEndpointI.obj: \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
@@ -3256,6 +3416,7 @@ IPEndpointI.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -3331,6 +3492,7 @@ LocatorInfo.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
@@ -3396,6 +3558,7 @@ LocatorInfo.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\FacetMap.h" \
@@ -3409,6 +3572,7 @@ LocatorInfo.obj: \
     "AcceptorF.h" \
     "Reference.h" \
     "$(includedir)\Ice\RouterF.h" \
+    "BatchRequestQueue.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
@@ -3455,6 +3619,7 @@ LoggerAdminI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -3487,6 +3652,7 @@ LoggerAdminI.obj: \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\Communicator.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
@@ -3617,6 +3783,7 @@ LoggerUtil.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -3646,6 +3813,7 @@ LoggerUtil.obj: \
     "NetworkProxyF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\FacetMap.h" \
@@ -3696,6 +3864,7 @@ MetricsAdminI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -3738,6 +3907,7 @@ MetricsAdminI.obj: \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\Metrics.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
@@ -3827,6 +3997,7 @@ MetricsObserverI.obj: \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -3869,6 +4040,7 @@ MetricsObserverI.obj: \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\MetricsFunctional.h" \
 
 Network.obj: \
@@ -3913,6 +4085,7 @@ Network.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -3943,18 +4116,50 @@ Network.obj: \
     "$(includedir)\IceUtil\StringUtil.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Properties.h" \
+    "ProtocolInstance.h" \
+    "EndpointIF.h" \
+    "ConnectorF.h" \
+    "IPEndpointIF.h" \
+    "Instance.h" \
+    "$(includedir)\IceUtil\RecMutex.h" \
+    "$(includedir)\IceUtil\Timer.h" \
+    "$(includedir)\IceUtil\Thread.h" \
+    "$(includedir)\Ice\InstrumentationF.h" \
+    "TraceLevelsF.h" \
+    "DefaultsAndOverridesF.h" \
+    "RouterInfoF.h" \
+    "LocatorInfoF.h" \
+    "ReferenceFactoryF.h" \
+    "$(includedir)\Ice\ThreadPoolF.h" \
+    "$(includedir)\Ice\ConnectionFactoryF.h" \
+    "ACM.h" \
+    "$(includedir)\Ice\ACMF.h" \
+    "$(includedir)\Ice\Connection.h" \
+    "$(includedir)\Ice\Endpoint.h" \
+    "$(includedir)\Ice\ObjectAdapterFactoryF.h" \
+    "EndpointFactoryManagerF.h" \
+    "RetryQueueF.h" \
+    "$(includedir)\Ice\DynamicLibraryF.h" \
+    "$(includedir)\Ice\PluginF.h" \
+    "$(includedir)\Ice\Initialize.h" \
+    "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
+    "ImplicitContextI.h" \
+    "$(includedir)\Ice\ImplicitContext.h" \
+    "$(includedir)\Ice\FacetMap.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
+    "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
     "$(includedir)\Ice\Logger.h" \
-    "$(includedir)\Ice\Plugin.h" \
     "$(includedir)\IceUtil\Random.h" \
 
 NetworkProxy.obj: \
@@ -3999,6 +4204,7 @@ NetworkProxy.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -4103,6 +4309,7 @@ Object.obj: \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -4155,6 +4362,7 @@ ObjectAdapterFactory.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
@@ -4245,6 +4453,7 @@ ObjectAdapterI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
@@ -4303,6 +4512,7 @@ ObjectAdapterI.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -4318,6 +4528,7 @@ ObjectAdapterI.obj: \
     "ReferenceFactory.h" \
     "Reference.h" \
     "$(includedir)\Ice\RouterF.h" \
+    "BatchRequestQueue.h" \
     "SharedContext.h" \
     "EndpointI.h" \
     "TransceiverF.h" \
@@ -4445,6 +4656,7 @@ ObserverHelper.obj: \
     "$(includedir)\Ice\ConnectionIF.h" \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -4465,6 +4677,8 @@ ObserverHelper.obj: \
     "$(includedir)\Ice\LocatorF.h" \
     "RouterInfoF.h" \
     "LocatorInfoF.h" \
+    "BatchRequestQueue.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -4578,6 +4792,7 @@ OpaqueEndpointI.obj: \
     "$(includedir)\Ice\ConnectionIF.h" \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -4658,6 +4873,7 @@ Outgoing.obj: \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
     "$(includedir)\Ice\Endpoint.h" \
@@ -4693,6 +4909,8 @@ Outgoing.obj: \
     "$(includedir)\Ice\LocatorF.h" \
     "RouterInfoF.h" \
     "LocatorInfoF.h" \
+    "BatchRequestQueue.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -4788,6 +5006,7 @@ OutgoingAsync.obj: \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\Endpoint.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\ConnectionFactoryF.h" \
@@ -4820,6 +5039,8 @@ OutgoingAsync.obj: \
     "$(includedir)\Ice\LocatorF.h" \
     "RouterInfoF.h" \
     "LocatorInfoF.h" \
+    "BatchRequestQueue.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -4898,6 +5119,7 @@ PluginManagerI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -4960,6 +5182,7 @@ PluginManagerI.obj: \
     "NetworkProxyF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -5006,6 +5229,7 @@ PropertiesAdminI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -5084,6 +5308,7 @@ PropertiesI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -5128,6 +5353,7 @@ PropertiesI.obj: \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "PropertyNames.h" \
     "$(includedir)\Ice\Logger.h" \
@@ -5216,6 +5442,7 @@ ProtocolInstance.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -5270,6 +5497,7 @@ ProtocolInstance.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -5351,6 +5579,7 @@ ProtocolPluginFacade.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -5384,6 +5613,7 @@ ProtocolPluginFacade.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -5438,6 +5668,7 @@ Proxy.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -5482,6 +5713,8 @@ Proxy.obj: \
     "$(includedir)\Ice\LocatorF.h" \
     "RouterInfoF.h" \
     "LocatorInfoF.h" \
+    "BatchRequestQueue.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "SharedContext.h" \
     "ObjectAdapterFactory.h" \
     "ObjectAdapterI.h" \
@@ -5501,7 +5734,6 @@ Proxy.obj: \
     "$(includedir)\Ice\LoggerF.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
-    "RequestHandlerFactory.h" \
     "EndpointI.h" \
     "TransceiverF.h" \
     "ConnectorF.h" \
@@ -5579,6 +5811,7 @@ ProxyFactory.obj: \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -5639,6 +5872,7 @@ ProxyFactory.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -5649,6 +5883,7 @@ ProxyFactory.obj: \
     "EndpointIF.h" \
     "$(includedir)\Ice\RouterF.h" \
     "$(includedir)\Ice\LocatorF.h" \
+    "BatchRequestQueue.h" \
     "SharedContext.h" \
     "LocatorInfo.h" \
     "RouterInfo.h" \
@@ -5699,6 +5934,7 @@ Reference.obj: \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -5725,6 +5961,8 @@ Reference.obj: \
     "$(includedir)\Ice\LocatorF.h" \
     "RouterInfoF.h" \
     "LocatorInfoF.h" \
+    "BatchRequestQueue.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -5800,6 +6038,9 @@ Reference.obj: \
     "$(includedir)\Ice\Logger.h" \
     "TraceLevels.h" \
     "HashUtil.h" \
+    "RequestHandlerFactory.h" \
+    "ConnectRequestHandlerF.h" \
+    "ConnectionRequestHandler.h" \
     "DefaultsAndOverrides.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
     "$(includedir)\IceUtil\Random.h" \
@@ -5842,6 +6083,7 @@ ReferenceFactory.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -5889,6 +6131,8 @@ ReferenceFactory.obj: \
     "EndpointIF.h" \
     "RouterInfoF.h" \
     "LocatorInfoF.h" \
+    "BatchRequestQueue.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "SharedContext.h" \
     "ProxyFactory.h" \
     "$(includedir)\Ice\OutgoingAsyncF.h" \
@@ -5993,6 +6237,7 @@ RegisterPlugins.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -6019,6 +6264,7 @@ RegisterPlugins.obj: \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
 
 RequestHandler.obj: \
 	RequestHandler.cpp \
@@ -6065,6 +6311,7 @@ RequestHandler.obj: \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -6090,6 +6337,8 @@ RequestHandler.obj: \
     "$(includedir)\Ice\LocatorF.h" \
     "RouterInfoF.h" \
     "LocatorInfoF.h" \
+    "BatchRequestQueue.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -6118,6 +6367,7 @@ RequestHandlerFactory.obj: \
     "$(includedir)\Ice\Handle.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\Config.h" \
+    "ConnectRequestHandlerF.h" \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ReferenceF.h" \
@@ -6173,6 +6423,7 @@ RequestHandlerFactory.obj: \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -6181,6 +6432,8 @@ RequestHandlerFactory.obj: \
     "$(includedir)\Ice\LocatorF.h" \
     "RouterInfoF.h" \
     "LocatorInfoF.h" \
+    "BatchRequestQueue.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -6337,6 +6590,7 @@ RetryQueue.obj: \
     "$(includedir)\Ice\Connection.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\Endpoint.h" \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\LoggerF.h" \
@@ -6350,6 +6604,7 @@ RetryQueue.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\FacetMap.h" \
@@ -6360,6 +6615,9 @@ RetryQueue.obj: \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
+    "TraceLevels.h" \
+    "$(includedir)\Ice\LoggerUtil.h" \
+    "$(includedir)\Ice\Logger.h" \
 
 RouterInfo.obj: \
 	RouterInfo.cpp \
@@ -6401,6 +6659,7 @@ RouterInfo.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -6443,6 +6702,8 @@ RouterInfo.obj: \
     "ReferenceFactoryF.h" \
     "$(includedir)\Ice\LocatorF.h" \
     "LocatorInfoF.h" \
+    "BatchRequestQueue.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -6493,6 +6754,7 @@ Selector.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
@@ -6545,6 +6807,7 @@ Selector.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -6631,6 +6894,7 @@ ServantManager.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -6658,6 +6922,7 @@ ServantManager.obj: \
     "NetworkProxyF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\Process.h" \
@@ -6722,6 +6987,7 @@ Service.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -6744,6 +7010,7 @@ Service.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -6937,6 +7204,7 @@ Stream.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -7001,6 +7269,7 @@ StreamI.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -7048,6 +7317,7 @@ StreamI.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -7105,6 +7375,7 @@ StreamSocket.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -7161,6 +7432,7 @@ StreamSocket.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -7233,6 +7505,7 @@ StringConverterPlugin.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\InstanceF.h" \
@@ -7269,6 +7542,7 @@ StringConverterPlugin.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
     "$(includedir)\Ice\Logger.h" \
@@ -7320,6 +7594,7 @@ TcpAcceptor.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -7381,6 +7656,7 @@ TcpAcceptor.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -7445,6 +7721,7 @@ TcpConnector.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -7507,6 +7784,7 @@ TcpConnector.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -7577,6 +7855,7 @@ TcpEndpointI.obj: \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
@@ -7633,6 +7912,7 @@ TcpEndpointI.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\FacetMap.h" \
@@ -7692,6 +7972,7 @@ TcpTransceiver.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -7745,6 +8026,7 @@ TcpTransceiver.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -7807,6 +8089,7 @@ ThreadPool.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
@@ -7860,6 +8143,7 @@ ThreadPool.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\FacetMap.h" \
@@ -7923,6 +8207,7 @@ TraceLevels.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -8019,6 +8304,7 @@ TraceUtil.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -8052,6 +8338,7 @@ TraceUtil.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -8111,6 +8398,7 @@ Transceiver.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -8183,6 +8471,7 @@ UdpConnector.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -8236,6 +8525,7 @@ UdpConnector.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -8311,6 +8601,7 @@ UdpEndpointI.obj: \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
@@ -8364,6 +8655,7 @@ UdpEndpointI.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\FacetMap.h" \
@@ -8424,6 +8716,7 @@ UdpTransceiver.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -8482,6 +8775,7 @@ UdpTransceiver.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -8548,6 +8842,7 @@ WSAcceptor.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -8601,6 +8896,7 @@ WSAcceptor.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -8666,6 +8962,7 @@ WSConnector.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -8718,6 +9015,7 @@ WSConnector.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -8795,6 +9093,7 @@ WSEndpoint.obj: \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -8840,6 +9139,7 @@ WSEndpoint.obj: \
     "NetworkProxyF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -8902,6 +9202,7 @@ WSTransceiver.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -8956,6 +9257,7 @@ WSTransceiver.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -9044,6 +9346,7 @@ DLLMain.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\InstanceF.h" \
@@ -9062,6 +9365,7 @@ DLLMain.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
@@ -9190,6 +9494,7 @@ Communicator.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -9303,6 +9608,7 @@ Connection.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -9864,6 +10170,7 @@ Locator.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -9945,6 +10252,7 @@ LocatorF.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -10060,6 +10368,7 @@ Metrics.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -10139,6 +10448,7 @@ ObjectAdapter.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -10383,6 +10693,7 @@ Process.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -10460,6 +10771,7 @@ ProcessF.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -10523,6 +10835,7 @@ Properties.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -10602,6 +10915,7 @@ PropertiesAdmin.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -10680,6 +10994,7 @@ PropertiesF.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -10743,6 +11058,7 @@ RemoteLogger.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -10822,6 +11138,7 @@ Router.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -10899,6 +11216,7 @@ RouterF.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp
new file mode 100644
index 00000000000..c34de544df7
--- /dev/null
+++ b/cpp/src/Ice/BatchRequestQueue.cpp
@@ -0,0 +1,227 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/BatchRequestQueue.h>
+#include <Ice/Instance.h>
+#include <Ice/Properties.h>
+
+using namespace std;
+using namespace IceInternal;
+
+IceUtil::Shared* IceInternal::upCast(BatchRequestQueue* p) { return p; }
+
+namespace
+{
+
+const int udpOverhead = 20 + 8;
+
+class BatchRequestI : public Ice::BatchRequest
+{
+public:
+
+    BatchRequestI(BatchRequestQueue& queue, const Ice::ObjectPrx& proxy, const string& operation, int size) :
+        _queue(queue), _proxy(proxy), _operation(operation), _size(size)
+    {
+    }
+
+    virtual void
+    enqueue() const
+    {
+        _queue.enqueueBatchRequest();
+    }
+
+    virtual int
+    getSize() const
+    {
+        return _size;
+    }
+
+    virtual const std::string&
+    getOperation() const
+    {
+        return _operation;
+    }
+
+    virtual const Ice::ObjectPrx&
+    getProxy() const
+    {
+        return _proxy;
+    }
+
+private:
+
+    BatchRequestQueue& _queue;
+    const Ice::ObjectPrx& _proxy;
+    const std::string& _operation;
+    const int _size;
+};
+
+}
+
+BatchRequestQueue::BatchRequestQueue(const InstancePtr& instance, bool datagram) :
+    _interceptor(instance->initializationData().batchRequestInterceptor),
+    _batchStream(instance.get(), Ice::currentProtocolEncoding),
+    _batchStreamInUse(false),
+    _batchStreamCanFlush(false),
+    _batchRequestNum(0)
+{
+    _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr));
+    _batchMarker = _batchStream.b.size();
+
+    _maxSize = instance->batchAutoFlushSize();
+    if(_maxSize > 0 && datagram)
+    {
+        const Ice::InitializationData& initData = instance->initializationData();
+        size_t udpSndSize = initData.properties->getPropertyAsIntWithDefault("Ice.UDP.SndSize", 65535 - udpOverhead);
+        if(udpSndSize < _maxSize)
+        {
+            _maxSize = udpSndSize;
+        }
+    }
+}
+
+void
+BatchRequestQueue::prepareBatchRequest(BasicStream* os)
+{
+    Lock sync(*this);
+    if(_exception.get())
+    {
+        _exception->ice_throw();
+    }
+
+    waitStreamInUse(false);
+    _batchStreamInUse = true;
+    _batchStream.swap(*os);
+}
+
+void
+BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrx& proxy, const std::string& operation)
+{
+    //
+    // No need for synchronization, no other threads are supposed
+    // to modify the queue since we set _batchStreamInUse to true.
+    //
+    assert(_batchStreamInUse);
+    _batchStream.swap(*os);
+
+    try
+    {
+        _batchStreamCanFlush = true; // Allow flush to proceed even if the stream is marked in use.
+
+        if(_maxSize > 0 && _batchStream.b.size() >= _maxSize)
+        {
+            proxy->begin_ice_flushBatchRequests();
+        }
+
+        assert(_batchMarker < _batchStream.b.size());
+        if(_interceptor)
+        {
+            BatchRequestI request(*this, proxy, operation, static_cast<int>(_batchStream.b.size() - _batchMarker));
+            _interceptor->enqueue(request, _batchRequestNum, static_cast<int>(_batchMarker));
+        }
+        else
+        {
+            _batchMarker = _batchStream.b.size();
+            ++_batchRequestNum;
+        }
+
+        Lock sync(*this);
+        _batchStream.resize(_batchMarker);
+        _batchStreamInUse = false;
+        _batchStreamCanFlush = false;
+        notifyAll();
+    }
+    catch(const std::exception&)
+    {
+        Lock sync(*this);
+        _batchStream.resize(_batchMarker);
+        _batchStreamInUse = false;
+        _batchStreamCanFlush = false;
+        notifyAll();
+        throw;
+    }
+}
+
+void
+BatchRequestQueue::abortBatchRequest(BasicStream* os)
+{
+    Lock sync(*this);
+    if(_batchStreamInUse)
+    {
+        _batchStream.swap(*os);
+        _batchStream.resize(_batchMarker);
+        _batchStreamInUse = false;
+        notifyAll();
+    }
+}
+
+int
+BatchRequestQueue::swap(BasicStream* os)
+{
+    Lock sync(*this);
+    if(_batchRequestNum == 0)
+    {
+        return 0;
+    }
+
+    waitStreamInUse(true);
+
+    vector<Ice::Byte> lastRequest;
+    if(_batchMarker < _batchStream.b.size())
+    {
+        vector<Ice::Byte>(_batchStream.b.begin() + _batchMarker, _batchStream.b.end()).swap(lastRequest);
+        _batchStream.b.resize(_batchMarker);
+    }
+
+    int requestNum = _batchRequestNum;
+    _batchStream.swap(*os);
+
+    //
+    // Reset the batch.
+    //
+    _batchRequestNum = 0;
+    _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr));
+    _batchMarker = _batchStream.b.size();
+    if(!lastRequest.empty())
+    {
+        _batchStream.writeBlob(&lastRequest[0], lastRequest.size());
+    }
+    return requestNum;
+}
+
+void
+BatchRequestQueue::destroy(const Ice::LocalException& ex)
+{
+    Lock sync(*this);
+    _exception.reset(ex.ice_clone());
+}
+
+bool
+BatchRequestQueue::isEmpty()
+{
+    Lock sync(*this);
+    return _batchStream.b.size() == sizeof(requestBatchHdr);
+}
+
+void
+BatchRequestQueue::waitStreamInUse(bool flush)
+{
+    while(_batchStreamInUse && !(flush && _batchStreamCanFlush))
+    {
+        wait();
+    }
+}
+
+void
+BatchRequestQueue::enqueueBatchRequest()
+{
+    assert(_batchMarker < _batchStream.b.size());
+    _batchMarker = _batchStream.b.size();
+    ++_batchRequestNum;
+}
diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h
new file mode 100644
index 00000000000..6a082af1921
--- /dev/null
+++ b/cpp/src/Ice/BatchRequestQueue.h
@@ -0,0 +1,59 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_BATCH_REQUEST_QUEUE_H
+#define ICE_BATCH_REQUEST_QUEUE_H
+
+#include <IceUtil/Shared.h>
+#include <IceUtil/Mutex.h>
+#include <IceUtil/Monitor.h>
+#include <IceUtil/UniquePtr.h>
+
+#include <Ice/BatchRequestInterceptor.h>
+#include <Ice/BatchRequestQueueF.h>
+#include <Ice/InstanceF.h>
+#include <Ice/BasicStream.h>
+
+namespace IceInternal
+{
+
+class BatchRequestQueue : public IceUtil::Shared, private IceUtil::Monitor<IceUtil::Mutex>
+{
+public:
+
+    BatchRequestQueue(const InstancePtr&, bool);
+
+    void prepareBatchRequest(BasicStream*);
+    void finishBatchRequest(BasicStream*, const Ice::ObjectPrx&, const std::string&);
+    void abortBatchRequest(BasicStream*);
+
+    int swap(BasicStream*);
+
+    void destroy(const Ice::LocalException&);
+    bool isEmpty();
+
+    void enqueueBatchRequest();
+
+private:
+
+    void waitStreamInUse(bool);
+
+    Ice::BatchRequestInterceptorPtr _interceptor;
+    BasicStream _batchStream;
+    bool _batchStreamInUse;
+    bool _batchStreamCanFlush;
+    int _batchRequestNum;
+    size_t _batchMarker;
+    IceUtil::UniquePtr<Ice::LocalException> _exception;
+    size_t _maxSize;
+};
+
+};
+
+#endif
diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp
index 8b2e505d8d7..d2e78fcd4a9 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.cpp
+++ b/cpp/src/Ice/CollocatedRequestHandler.cpp
@@ -29,14 +29,13 @@ namespace
 class InvokeAll : public DispatchWorkItem
 {
 public:
-        
+
     InvokeAll(OutgoingBase* out,
               BasicStream* os,
-              CollocatedRequestHandler* handler, 
+              CollocatedRequestHandler* handler,
               Int requestId,
-              Int invokeNum, 
-              bool batch) : 
-        _out(out), _os(os), _handler(handler), _requestId(requestId), _invokeNum(invokeNum), _batch(batch)
+              Int batchRequestNum) :
+        _out(out), _os(os), _handler(handler), _requestId(requestId), _batchRequestNum(batchRequestNum)
     {
     }
 
@@ -45,31 +44,29 @@ public:
     {
         if(_handler->sent(_out))
         {
-            _handler->invokeAll(_os, _requestId, _invokeNum, _batch);
+            _handler->invokeAll(_os, _requestId, _batchRequestNum);
         }
     }
-    
+
 private:
-    
+
     OutgoingBase* _out;
     BasicStream* _os;
     CollocatedRequestHandlerPtr _handler;
     Int _requestId;
-    Int _invokeNum;
-    bool _batch;
+    Int _batchRequestNum;
 };
 
 class InvokeAllAsync : public DispatchWorkItem
 {
 public:
-        
+
     InvokeAllAsync(const OutgoingAsyncBasePtr& outAsync,
                    BasicStream* os,
-                   CollocatedRequestHandler* handler, 
+                   CollocatedRequestHandler* handler,
                    Int requestId,
-                   Int invokeNum, 
-                   bool batch) : 
-        _outAsync(outAsync), _os(os), _handler(handler), _requestId(requestId), _invokeNum(invokeNum), _batch(batch)
+                   Int batchRequestNum) :
+        _outAsync(outAsync), _os(os), _handler(handler), _requestId(requestId), _batchRequestNum(batchRequestNum)
     {
     }
 
@@ -78,46 +75,17 @@ public:
     {
         if(_handler->sentAsync(_outAsync.get()))
         {
-            _handler->invokeAll(_os, _requestId, _invokeNum, _batch);
+            _handler->invokeAll(_os, _requestId, _batchRequestNum);
         }
     }
-    
+
 private:
-    
+
     OutgoingAsyncBasePtr _outAsync;
     BasicStream* _os;
     CollocatedRequestHandlerPtr _handler;
     Int _requestId;
-    Int _invokeNum;
-    bool _batch;
-};
-
-class InvokeBatchRequests : public DispatchWorkItem
-{
-public:
-    
-    InvokeBatchRequests(const CollocatedRequestHandlerPtr& handler,
-                        BasicStream& stream,
-                        Int invokeNum) :
-        _handler(handler),
-        _stream(stream.instance(), currentProtocolEncoding),
-        _invokeNum(invokeNum)
-    {
-        _stream.swap(stream);
-    }
-    
-    virtual void
-    run()
-    {
-        _handler->invokeAll(&_stream, 0, _invokeNum, true);
-    }
-    
-private:
-    
-    const CollocatedRequestHandlerPtr _handler;
-    const OutgoingAsyncBasePtr _outAsync;
-    BasicStream _stream;
-    Int _invokeNum;
+    Int _batchRequestNum;
 };
 
 void
@@ -134,16 +102,12 @@ fillInValue(BasicStream* os, int pos, Int value)
 }
 
 CollocatedRequestHandler::CollocatedRequestHandler(const ReferencePtr& ref, const ObjectAdapterPtr& adapter) :
-    RequestHandler(ref), 
-    _adapter(ObjectAdapterIPtr::dynamicCast(adapter)), 
+    RequestHandler(ref),
+    _adapter(ObjectAdapterIPtr::dynamicCast(adapter)),
     _dispatcher(_reference->getInstance()->initializationData().dispatcher),
     _logger(_reference->getInstance()->initializationData().logger), // Cached for better performance.
     _traceLevels(_reference->getInstance()->traceLevels()), // Cached for better performance.
-    _batchAutoFlushSize(ref->getInstance()->batchAutoFlushSize()),
-    _requestId(0),
-    _batchStreamInUse(false),
-    _batchRequestNum(0),
-    _batchStream(ref->getInstance().get(), currentProtocolEncoding)
+    _requestId(0)
 {
 }
 
@@ -152,124 +116,29 @@ CollocatedRequestHandler::~CollocatedRequestHandler()
 }
 
 RequestHandlerPtr
-CollocatedRequestHandler::connect(const Ice::ObjectPrx&)
-{
-    return this;
-}
-
-RequestHandlerPtr
 CollocatedRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler)
 {
     return previousHandler.get() == this ? newHandler : this;
 }
 
-void
-CollocatedRequestHandler::prepareBatchRequest(BasicStream* os)
-{
-    Lock sync(*this);
-    while(_batchStreamInUse)
-    {
-        wait();
-    }
-
-    if(_batchStream.b.empty())
-    {
-        try
-        {
-            _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr));
-        }
-        catch(const LocalException& ex)
-        {
-            ex.ice_throw();
-        }
-    }
-
-    _batchStreamInUse = true;
-    _batchMarker = _batchStream.b.size();
-    _batchStream.swap(*os);
-}
-
-void
-CollocatedRequestHandler::finishBatchRequest(BasicStream* os)
-{
-    try
-    {
-        Lock sync(*this);
-        _batchStream.swap(*os);
-
-        if(_batchAutoFlushSize > 0 && (_batchStream.b.size() > _batchAutoFlushSize))
-        {
-            //
-            // Temporarily save the last request.
-            //
-            vector<Byte> lastRequest(_batchStream.b.begin() + _batchMarker, _batchStream.b.end());
-            _batchStream.b.resize(_batchMarker);
-
-            _adapter->getThreadPool()->dispatch(new InvokeBatchRequests(this, _batchStream, _batchRequestNum));
-            
-            //
-            // Reset the batch.
-            //
-            BasicStream dummy(_reference->getInstance().get(), currentProtocolEncoding);
-            _batchStream.swap(dummy);
-            _batchRequestNum = 0;
-            _batchMarker = 0;
-            
-            //
-            // Start a new batch with the last message that caused us to go over the limit.
-            //
-            _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr));
-            _batchStream.writeBlob(&lastRequest[0], lastRequest.size());
-        }
-        
-        //
-        // Increment the number of requests in the batch.
-        //
-        assert(_batchStreamInUse);
-        ++_batchRequestNum;
-        _batchStreamInUse = false;
-        notifyAll();
-    }
-    catch(const LocalException&)
-    {
-        abortBatchRequest();
-        throw;
-    }
-}
-
-void
-CollocatedRequestHandler::abortBatchRequest()
-{
-    Lock sync(*this);
-
-    BasicStream dummy(_reference->getInstance().get(), currentProtocolEncoding);
-    _batchStream.swap(dummy);
-    _batchRequestNum = 0;
-    _batchMarker = 0;
-
-    assert(_batchStreamInUse);
-    _batchStreamInUse = false;
-    notifyAll();
-}
-
 bool
-CollocatedRequestHandler::sendRequest(OutgoingBase* out)
+CollocatedRequestHandler::sendRequest(ProxyOutgoingBase* out)
 {
     out->invokeCollocated(this);
     return !_response && _reference->getInvocationTimeout() == 0;
 }
 
 AsyncStatus
-CollocatedRequestHandler::sendAsyncRequest(const OutgoingAsyncBasePtr& outAsync)
+CollocatedRequestHandler::sendAsyncRequest(const ProxyOutgoingAsyncBasePtr& outAsync)
 {
     return outAsync->invokeCollocated(this);
 }
 
-void 
+void
 CollocatedRequestHandler::requestCanceled(OutgoingBase* out, const LocalException& ex)
 {
     Lock sync(*this);
-    
+
     map<OutgoingBase*, Int>::iterator p = _sendRequests.find(out);
     if(p != _sendRequests.end())
     {
@@ -286,12 +155,12 @@ CollocatedRequestHandler::requestCanceled(OutgoingBase* out, const LocalExceptio
     Outgoing* o = dynamic_cast<Outgoing*>(out);
     if(o)
     {
-        for(map<Int, Outgoing*>::iterator q = _requests.begin(); q != _requests.end(); ++q)
+        for(map<Int, OutgoingBase*>::iterator q = _requests.begin(); q != _requests.end(); ++q)
         {
             if(q->second == o)
             {
                 InvocationTimeoutException ex(__FILE__, __LINE__);
-                o->completed(ex);
+                q->second->completed(ex);
                 _requests.erase(q);
                 return; // We're done.
             }
@@ -322,7 +191,7 @@ CollocatedRequestHandler::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAs
     OutgoingAsyncPtr o = OutgoingAsyncPtr::dynamicCast(outAsync);
     if(o)
     {
-        for(map<Int, OutgoingAsyncPtr>::iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q)
+        for(map<Int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q)
         {
             if(q->second.get() == o.get())
             {
@@ -338,7 +207,7 @@ CollocatedRequestHandler::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAs
 }
 
 void
-CollocatedRequestHandler::invokeRequest(Outgoing* out)
+CollocatedRequestHandler::invokeRequest(OutgoingBase* out, int batchRequestNum)
 {
     int requestId = 0;
     {
@@ -348,29 +217,31 @@ CollocatedRequestHandler::invokeRequest(Outgoing* out)
             requestId = ++_requestId;
             _requests.insert(make_pair(requestId, out));
         }
+
         _sendRequests.insert(make_pair(out, requestId));
-    } 
+    }
 
     out->attachCollocatedObserver(_adapter, requestId);
 
     if(_reference->getInvocationTimeout() > 0)
     {
         // Don't invoke from the user thread, invocation timeouts wouldn't work otherwise.
-        _adapter->getThreadPool()->dispatch(new InvokeAll(out, out->os(), this, requestId, 1, false));
+        _adapter->getThreadPool()->dispatch(new InvokeAll(out, out->os(), this, requestId, batchRequestNum));
     }
     else if(_dispatcher)
     {
-        _adapter->getThreadPool()->dispatchFromThisThread(new InvokeAll(out, out->os(), this, requestId, 1, false));
+        _adapter->getThreadPool()->dispatchFromThisThread(new InvokeAll(out, out->os(), this, requestId,
+                                                                        batchRequestNum));
     }
     else // Optimization: directly call invokeAll if there's no dispatcher.
     {
         out->sent();
-        invokeAll(out->os(), requestId, 1, false);
+        invokeAll(out->os(), requestId, batchRequestNum);
     }
 }
 
 AsyncStatus
-CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsync* outAsync)
+CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int batchRequestNum)
 {
     int requestId = 0;
     {
@@ -383,125 +254,25 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsync* outAsync)
             requestId = ++_requestId;
             _asyncRequests.insert(make_pair(requestId, outAsync));
         }
+
         _sendAsyncRequests.insert(make_pair(outAsync, requestId));
     }
 
     outAsync->attachCollocatedObserver(_adapter, requestId);
 
-    _adapter->getThreadPool()->dispatch(new InvokeAllAsync(outAsync, outAsync->getOs(), this, requestId, 1, false));
+    _adapter->getThreadPool()->dispatch(new InvokeAllAsync(outAsync, outAsync->getOs(), this, requestId,
+                                                           batchRequestNum));
     return AsyncStatusQueued;
 }
 
 void
-CollocatedRequestHandler::invokeBatchRequests(OutgoingBase* out)
-{
-    Int invokeNum;
-    {
-        Lock sync(*this);
-        while(_batchStreamInUse)
-        {
-            wait();
-        }
-        
-        invokeNum = _batchRequestNum;
-
-        if(_batchRequestNum > 0)
-        {
-            _sendRequests.insert(make_pair(out, 0));
-
-            assert(!_batchStream.b.empty());
-            _batchStream.swap(*out->os());
-            
-            //
-            // Reset the batch stream.
-            //
-            BasicStream dummy(_reference->getInstance().get(), currentProtocolEncoding);
-            _batchStream.swap(dummy);
-            _batchRequestNum = 0;
-            _batchMarker = 0;
-        }
-    }
-        
-    out->attachCollocatedObserver(_adapter, 0);
-
-    if(invokeNum > 0)
-    {
-        if(_reference->getInvocationTimeout() > 0)
-        {
-            _adapter->getThreadPool()->dispatch(new InvokeAll(out, out->os(), this, 0, invokeNum, true));
-        }
-        else if(_dispatcher)
-        {
-            _adapter->getThreadPool()->dispatchFromThisThread(new InvokeAll(out, out->os(), this, 0, invokeNum, true));
-        }
-        else // Optimization: directly call invokeAll if there's no dispatcher.
-        {
-            out->sent();
-            invokeAll(out->os(), 0, invokeNum, true); // Invoke from the user thread.
-        }
-    }
-    else
-    {
-        out->sent();
-    }
-}
-
-AsyncStatus
-CollocatedRequestHandler::invokeAsyncBatchRequests(OutgoingAsyncBase* outAsync)
-{
-    Int invokeNum;
-    {
-        Lock sync(*this);
-        while(_batchStreamInUse)
-        {
-            wait();
-        }
-        
-        invokeNum = _batchRequestNum;
-        if(_batchRequestNum > 0)
-        {
-            outAsync->cancelable(this); // This will throw if the request is canceled
-
-            _sendAsyncRequests.insert(make_pair(outAsync, 0));
-
-            assert(!_batchStream.b.empty());
-            _batchStream.swap(*outAsync->getOs());
-            
-            //
-            // Reset the batch stream.
-            //
-            BasicStream dummy(_reference->getInstance().get(), currentProtocolEncoding);
-            _batchStream.swap(dummy);
-            _batchRequestNum = 0;
-            _batchMarker = 0;
-        }
-    }
-
-    outAsync->attachCollocatedObserver(_adapter, 0);
-    
-    if(invokeNum > 0)
-    {
-        _adapter->getThreadPool()->dispatch(new InvokeAllAsync(outAsync, outAsync->getOs(), this, 0, invokeNum,true));
-        return AsyncStatusQueued;
-    }
-    else if(outAsync->sent())
-    {
-        return static_cast<AsyncStatus>(AsyncStatusSent | AsyncStatusInvokeSentCallback);
-    }
-    else
-    {
-        return AsyncStatusSent;
-    }
-}
-
-void 
 CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, bool amd)
 {
-    OutgoingAsyncPtr outAsync;
+    OutgoingAsyncBasePtr outAsync;
     {
         Lock sync(*this);
         assert(_response);
-        
+
         os->i = os->b.begin() + sizeof(replyHdr) + 4;
 
         if(_traceLevels->protocol >= 1)
@@ -510,7 +281,7 @@ CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, boo
             traceRecv(*os, _logger, _traceLevels);
         }
 
-        map<int, Outgoing*>::iterator p = _requests.find(requestId);
+        map<int, OutgoingBase*>::iterator p = _requests.find(requestId);
         if(p != _requests.end())
         {
             p->second->completed(*os);
@@ -518,7 +289,7 @@ CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, boo
         }
         else
         {
-            map<int, OutgoingAsyncPtr>::iterator q = _asyncRequests.find(requestId);
+            map<int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.find(requestId);
             if(q != _asyncRequests.end())
             {
                 os->swap(*q->second->getIs());
@@ -565,7 +336,7 @@ CollocatedRequestHandler::systemException(Int requestId, const SystemException&
     return true;
 }
 
-void 
+void
 CollocatedRequestHandler::invokeException(Int requestId, const LocalException& ex, int invokeNum, bool amd)
 {
     handleException(requestId, ex, amd);
@@ -616,9 +387,9 @@ CollocatedRequestHandler::sentAsync(OutgoingAsyncBase* outAsync)
 }
 
 void
-CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int invokeNum, bool batch)
+CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int batchRequestNum)
 {
-    if(batch)
+    if(batchRequestNum > 0)
     {
         os->i = os->b.begin() + sizeof(requestBatchHdr);
     }
@@ -634,18 +405,19 @@ CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int invokeNu
         {
             fillInValue(os, headerSize, requestId);
         }
-        else if(batch)
+        else if(batchRequestNum > 0)
         {
-            fillInValue(os, headerSize, invokeNum);
+            fillInValue(os, headerSize, batchRequestNum);
         }
         traceSend(*os, _logger, _traceLevels);
     }
 
+    int invokeNum = batchRequestNum > 0 ? batchRequestNum : 1;
     ServantManagerPtr servantManager = _adapter->getServantManager();
     try
     {
         while(invokeNum > 0)
-        {        
+        {
             try
             {
                 _adapter->incDirectCount();
@@ -675,11 +447,11 @@ CollocatedRequestHandler::handleException(int requestId, const Exception& ex, bo
         return; // Ignore exception for oneway messages.
     }
 
-    OutgoingAsyncPtr outAsync;
+    OutgoingAsyncBasePtr outAsync;
     {
         Lock sync(*this);
-        
-        map<int, Outgoing*>::iterator p = _requests.find(requestId);
+
+        map<int, OutgoingBase*>::iterator p = _requests.find(requestId);
         if(p != _requests.end())
         {
             p->second->completed(ex);
@@ -687,7 +459,7 @@ CollocatedRequestHandler::handleException(int requestId, const Exception& ex, bo
         }
         else
         {
-            map<int, OutgoingAsyncPtr>::iterator q = _asyncRequests.find(requestId);
+            map<int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.find(requestId);
             if(q != _asyncRequests.end())
             {
                 if(q->second->completed(ex))
diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h
index 751e8f24e7d..248984ed647 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.h
+++ b/cpp/src/Ice/CollocatedRequestHandler.h
@@ -43,15 +43,10 @@ public:
     CollocatedRequestHandler(const ReferencePtr&, const Ice::ObjectAdapterPtr&);
     virtual ~CollocatedRequestHandler();
 
-    virtual RequestHandlerPtr connect(const Ice::ObjectPrx&);
     virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&);
 
-    virtual void prepareBatchRequest(BasicStream*);
-    virtual void finishBatchRequest(BasicStream*);
-    virtual void abortBatchRequest();
-
-    virtual bool sendRequest(OutgoingBase*);
-    virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncBasePtr&);
+    virtual bool sendRequest(ProxyOutgoingBase*);
+    virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&);
 
     virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&);
     virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&);
@@ -66,15 +61,13 @@ public:
     virtual Ice::ConnectionIPtr getConnection();
     virtual Ice::ConnectionIPtr waitForConnection();
 
-    void invokeRequest(Outgoing*);
-    AsyncStatus invokeAsyncRequest(OutgoingAsync*);
-    void invokeBatchRequests(OutgoingBase*);
-    AsyncStatus invokeAsyncBatchRequests(OutgoingAsyncBase*);
+    void invokeRequest(OutgoingBase*, int);
+    AsyncStatus invokeAsyncRequest(OutgoingAsyncBase*, int);
 
     bool sent(OutgoingBase*);
     bool sentAsync(OutgoingAsyncBase*);
 
-    void invokeAll(BasicStream*, Ice::Int, Ice::Int, bool);
+    void invokeAll(BasicStream*, Ice::Int, Ice::Int);
 
 private:
 
@@ -84,20 +77,14 @@ private:
     const bool _dispatcher;
     const Ice::LoggerPtr _logger;
     const TraceLevelsPtr _traceLevels;
-    const size_t _batchAutoFlushSize;
 
     int _requestId;
 
     std::map<OutgoingBase*, Ice::Int> _sendRequests;
     std::map<OutgoingAsyncBasePtr, Ice::Int> _sendAsyncRequests;
 
-    std::map<Ice::Int, Outgoing*> _requests;
-    std::map<Ice::Int, OutgoingAsyncPtr> _asyncRequests;
-
-    bool _batchStreamInUse;
-    int _batchRequestNum;
-    BasicStream _batchStream;
-    size_t _batchMarker;
+    std::map<Ice::Int, OutgoingBase*> _requests;
+    std::map<Ice::Int, OutgoingAsyncBasePtr> _asyncRequests;
 };
 typedef IceUtil::Handle<CollocatedRequestHandler> CollocatedRequestHandlerPtr;
 
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 018e743233a..6ddd5544c91 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -279,11 +279,11 @@ Ice::CommunicatorI::__begin_flushBatchRequests(const IceInternal::CallbackBasePt
     // This callback object receives the results of all invocations
     // of Connection::begin_flushBatchRequests.
     //
-    CommunicatorFlushBatchPtr result = new CommunicatorFlushBatch(this, 
-                                                                  _instance, 
-                                                                  __flushBatchRequests_name, 
-                                                                  cb, 
-                                                                  cookie);
+    CommunicatorFlushBatchAsyncPtr result = new CommunicatorFlushBatchAsync(this,
+                                                                            _instance,
+                                                                            __flushBatchRequests_name,
+                                                                            cb,
+                                                                            cookie);
 
     connectionFactory->flushAsyncBatchRequests(result);
     adapterFactory->flushAsyncBatchRequests(result);
diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp
index fce13d5e88a..993cb065c23 100644
--- a/cpp/src/Ice/ConnectRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectRequestHandler.cpp
@@ -23,14 +23,13 @@
 using namespace std;
 using namespace IceInternal;
 
+IceUtil::Shared* IceInternal::upCast(ConnectRequestHandler* p) { return p; }
+
 ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrx& proxy) :
     RequestHandler(ref),
-    _connect(true),
     _proxy(proxy),
     _initialized(false),
-    _flushing(false),
-    _batchRequestInProgress(false),
-    _batchStream(ref->getInstance().get(), Ice::currentProtocolEncoding)
+    _flushing(false)
 {
 }
 
@@ -41,39 +40,27 @@ ConnectRequestHandler::~ConnectRequestHandler()
 RequestHandlerPtr
 ConnectRequestHandler::connect(const Ice::ObjectPrx& proxy)
 {
-    //
-    // Initiate the connection if connect() is called by the proxy that
-    // created the handler.
-    //
-    if(proxy.get() == _proxy.get() && _connect) 
-    {
-        _connect = false; // Call getConnection only once
-        _reference->getConnection(this);
-    }
-
+    Lock sync(*this);
     try
     {
-        Lock sync(*this);
         if(!initialized())
         {
             _proxies.insert(proxy);
-            return this;
         }
     }
     catch(const Ice::LocalException&)
     {
-        throw;
-    }
-
-    if(_connectionRequestHandler)
-    {
-        proxy->__setRequestHandler(this, _connectionRequestHandler);
-        return _connectionRequestHandler;
-    }
-    else
-    {
-        return this;
+        //
+        // Only throw if the connection didn't get established. If
+        // it died after being established, we allow the caller to
+        // retry the connection establishment by not throwing here.
+        //
+        if(!_connection)
+        {
+            throw;
+        }
     }
+    return _requestHandler ? _requestHandler : this;
 }
 
 RequestHandlerPtr
@@ -82,70 +69,8 @@ ConnectRequestHandler::update(const RequestHandlerPtr& previousHandler, const Re
     return previousHandler.get() == this ? newHandler : this;
 }
 
-void
-ConnectRequestHandler::prepareBatchRequest(BasicStream* os)
-{
-    {
-        Lock sync(*this);
-        while(_batchRequestInProgress)
-        {
-            wait();
-        }
-
-        if(!initialized())
-        {
-            _batchRequestInProgress = true;
-            _batchStream.swap(*os);
-            return;
-        }
-    }
-    _connection->prepareBatchRequest(os);
-}
-
-void
-ConnectRequestHandler::finishBatchRequest(BasicStream* os)
-{
-    {
-        Lock sync(*this);
-        if(!initialized()) // This can't throw until _batchRequestInProgress = false
-        {
-            assert(_batchRequestInProgress);
-            _batchRequestInProgress = false;
-            notifyAll();
-
-            _batchStream.swap(*os);
-
-            Request req;
-            req.os = new BasicStream(_reference->getInstance().get(), Ice::currentProtocolEncoding);
-            req.os->swap(_batchStream);
-            _requests.push_back(req);
-            return;
-        }
-    }
-    _connection->finishBatchRequest(os, _compress);
-}
-
-void
-ConnectRequestHandler::abortBatchRequest()
-{
-    {
-        Lock sync(*this);
-        if(!initialized()) // This can't throw until _batchRequestInProgress = false
-        {
-            assert(_batchRequestInProgress);
-            _batchRequestInProgress = false;
-            notifyAll();
-
-            BasicStream dummy(_reference->getInstance().get(), Ice::currentProtocolEncoding);
-            _batchStream.swap(dummy);
-            return;
-        }
-    }
-    _connection->abortBatchRequest();
-}
-
 bool
-ConnectRequestHandler::sendRequest(OutgoingBase* out)
+ConnectRequestHandler::sendRequest(ProxyOutgoingBase* out)
 {
     {
         Lock sync(*this);
@@ -164,11 +89,11 @@ ConnectRequestHandler::sendRequest(OutgoingBase* out)
             throw RetryException(ex);
         }
     }
-    return out->send(_connection, _compress, _response) && !_response; // Finished if sent and no response.
+    return out->invokeRemote(_connection, _compress, _response) && !_response; // Finished if sent and no response.
 }
 
 AsyncStatus
-ConnectRequestHandler::sendAsyncRequest(const OutgoingAsyncBasePtr& out)
+ConnectRequestHandler::sendAsyncRequest(const ProxyOutgoingAsyncBasePtr& out)
 {
     {
         Lock sync(*this);
@@ -192,7 +117,7 @@ ConnectRequestHandler::sendAsyncRequest(const OutgoingAsyncBasePtr& out)
             throw RetryException(ex);
         }
     }
-    return out->send(_connection, _compress, _response);
+    return out->invokeRemote(_connection, _compress, _response);
 }
 
 void
@@ -350,18 +275,13 @@ ConnectRequestHandler::setException(const Ice::LocalException& ex)
         {
             p->out->completed(*_exception.get());
         }
-        else if(p->outAsync)
+        else
         {
             if(p->outAsync->completed(*_exception.get()))
             {
                 p->outAsync->invokeCompletedAsync();
             }
         }
-        else
-        {
-            assert(p->os);
-            delete p->os;
-        }
     }
     _requests.clear();
     notifyAll();
@@ -413,11 +333,6 @@ ConnectRequestHandler::flushRequests()
         Lock sync(*this);
         assert(_connection && !_initialized);
 
-        while(_batchRequestInProgress)
-        {
-            wait();
-        }
-
         //
         // We set the _flushing flag to true to prevent any additional queuing. Callers
         // might block for a little while as the queued requests are being sent but this
@@ -434,29 +349,9 @@ ConnectRequestHandler::flushRequests()
         {
             if(req.out)
             {
-                req.out->send(_connection, _compress, _response);
-            }
-            else if(req.os)
-            {
-                BasicStream os(req.os->instance(), Ice::currentProtocolEncoding);
-                _connection->prepareBatchRequest(&os);
-                try
-                {
-                    const Ice::Byte* bytes;
-                    req.os->i = req.os->b.begin();
-                    req.os->readBlob(bytes, req.os->b.size());
-                    os.writeBlob(bytes, req.os->b.size());
-                }
-                catch(const Ice::LocalException&)
-                {
-                    _connection->abortBatchRequest();
-                    throw;
-                }
-
-                _connection->finishBatchRequest(&os, _compress);
-                delete req.os;
+                req.out->invokeRemote(_connection, _compress, _response);
             }
-            else if(req.outAsync->send(_connection, _compress, _response) & AsyncStatusInvokeSentCallback)
+            else if(req.outAsync->invokeRemote(_connection, _compress, _response) & AsyncStatusInvokeSentCallback)
             {
                 req.outAsync->invokeSentAsync();
             }
@@ -464,24 +359,14 @@ ConnectRequestHandler::flushRequests()
         catch(const RetryException& ex)
         {
             exception.reset(ex.get()->ice_clone());
-            try
-            {
-                // Remove the request handler before retrying.
-                _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this);
-            }
-            catch(const Ice::CommunicatorDestroyedException&)
-            {
-                // Ignore
-            }
+
+            // Remove the request handler before retrying.
+            _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this);
 
             if(req.out)
             {
                 req.out->retryException(*ex.get());
             }
-            else if(req.os)
-            {
-                delete req.os;
-            }
             else
             {
                 req.outAsync->retryException(*ex.get());
@@ -494,10 +379,6 @@ ConnectRequestHandler::flushRequests()
             {
                 req.out->completed(ex);
             }
-            else if(req.os)
-            {
-                delete req.os;
-            }
             else if(req.outAsync->completed(ex))
             {
                 req.outAsync->invokeCompletedAsync();
@@ -514,10 +395,10 @@ ConnectRequestHandler::flushRequests()
     //
     if(_reference->getCacheConnection() && !exception.get())
     {
-        _connectionRequestHandler = new ConnectionRequestHandler(_reference, _connection, _compress);
+        _requestHandler = new ConnectionRequestHandler(_reference, _connection, _compress);
         for(set<Ice::ObjectPrx>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
         {
-            (*p)->__setRequestHandler(this, _connectionRequestHandler);
+            (*p)->__updateRequestHandler(this, _requestHandler);
         }
     }
 
@@ -527,18 +408,13 @@ ConnectRequestHandler::flushRequests()
         _exception.swap(exception);
         _initialized = !_exception.get();
         _flushing = false;
-        try
-        {
-            //
-            // Only remove once all the requests are flushed to
-            // guarantee serialization.
-            //
-            _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this);
-        }
-        catch(const Ice::CommunicatorDestroyedException&)
-        {
-            // Ignore
-        }
+
+        //
+        // Only remove once all the requests are flushed to
+        // guarantee serialization.
+        //
+        _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this);
+
         _proxies.clear();
         _proxy = 0; // Break cyclic reference count.
         notifyAll();
diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h
index 75686fd4bb7..fc202d1c893 100644
--- a/cpp/src/Ice/ConnectRequestHandler.h
+++ b/cpp/src/Ice/ConnectRequestHandler.h
@@ -12,15 +12,15 @@
 
 #include <IceUtil/Monitor.h>
 #include <IceUtil/Mutex.h>
+#include <IceUtil/UniquePtr.h>
 
+#include <Ice/ConnectRequestHandlerF.h>
 #include <Ice/RequestHandler.h>
 #include <Ice/Reference.h>
 #include <Ice/RouterInfo.h>
 #include <Ice/ProxyF.h>
 #include <Ice/BasicStream.h>
 
-#include <IceUtil/UniquePtr.h>
-
 #include <deque>
 #include <set>
 
@@ -37,15 +37,11 @@ public:
     ConnectRequestHandler(const ReferencePtr&, const Ice::ObjectPrx&);
     virtual ~ConnectRequestHandler();
 
-    virtual RequestHandlerPtr connect(const Ice::ObjectPrx&);
+    RequestHandlerPtr connect(const Ice::ObjectPrx&);
     virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&);
 
-    virtual void prepareBatchRequest(BasicStream*);
-    virtual void finishBatchRequest(BasicStream*);
-    virtual void abortBatchRequest();
-
-    virtual bool sendRequest(OutgoingBase*);
-    virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncBasePtr&);
+    virtual bool sendRequest(ProxyOutgoingBase*);
+    virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&);
 
     virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&);
     virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&);
@@ -65,16 +61,14 @@ private:
 
     struct Request
     {
-        Request() : out(0), os(0)
+        Request() : out(0)
         {
         }
 
-        OutgoingBase* out;
-        OutgoingAsyncBasePtr outAsync;
-        BasicStream* os;
+        ProxyOutgoingBase* out;
+        ProxyOutgoingAsyncBasePtr outAsync;
     };
 
-    bool _connect;
     Ice::ObjectPrx _proxy;
     std::set<Ice::ObjectPrx> _proxies;
 
@@ -85,12 +79,9 @@ private:
     bool _flushing;
 
     std::deque<Request> _requests;
-    bool _batchRequestInProgress;
-    BasicStream _batchStream;
 
-    RequestHandlerPtr _connectionRequestHandler;
+    RequestHandlerPtr _requestHandler;
 };
-typedef IceUtil::Handle<ConnectRequestHandler> ConnectRequestHandlerPtr;
 
 }
 
diff --git a/cpp/src/Ice/ConnectRequestHandlerF.h b/cpp/src/Ice/ConnectRequestHandlerF.h
new file mode 100644
index 00000000000..f60cdaa1804
--- /dev/null
+++ b/cpp/src/Ice/ConnectRequestHandlerF.h
@@ -0,0 +1,25 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_CONNECT_REQUEST_HANDLER_F_H
+#define ICE_CONNECT_REQUEST_HANDLER_F_H
+
+#include <IceUtil/Shared.h>
+#include <Ice/Handle.h>
+
+namespace IceInternal
+{
+
+class ConnectRequestHandler;
+ICE_API IceUtil::Shared* upCast(ConnectRequestHandler*);
+typedef IceInternal::Handle<ConnectRequestHandler> ConnectRequestHandlerPtr;
+
+}
+
+#endif
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 730211c6aac..cfcef92d9bc 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -266,7 +266,7 @@ IceInternal::OutgoingConnectionFactory::removeAdapter(const ObjectAdapterPtr& ad
 }
 
 void
-IceInternal::OutgoingConnectionFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchPtr& outAsync)
+IceInternal::OutgoingConnectionFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync)
 {
     list<ConnectionIPtr> c;
 
@@ -1191,7 +1191,7 @@ IceInternal::IncomingConnectionFactory::connections() const
 }
 
 void
-IceInternal::IncomingConnectionFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchPtr& outAsync)
+IceInternal::IncomingConnectionFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync)
 {
     list<ConnectionIPtr> c = connections(); // connections() is synchronized, so no need to synchronize here.
 
@@ -1556,10 +1556,10 @@ IceInternal::IncomingConnectionFactory::setState(State state)
             if(_acceptor)
             {
                 //
-                // If possible, close the acceptor now to prevent new connections from 
+                // If possible, close the acceptor now to prevent new connections from
                 // being accepted while we are deactivating. This is especially useful
                 // if there are no more threads in the thread pool available to dispatch
-                // the finish() call. Not all selector implementations do support this 
+                // the finish() call. Not all selector implementations do support this
                 // however.
                 //
                 if(_adapter->getThreadPool()->finish(this, true))
@@ -1640,4 +1640,3 @@ IceInternal::IncomingConnectionFactory::closeAcceptor()
 
     _acceptor->close();
 }
-
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index 64c8d130f4e..b6429b80e7f 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -66,7 +66,7 @@ public:
                 const CreateConnectionCallbackPtr&);
     void setRouterInfo(const RouterInfoPtr&);
     void removeAdapter(const Ice::ObjectAdapterPtr&);
-    void flushAsyncBatchRequests(const CommunicatorFlushBatchPtr&);
+    void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&);
 
 private:
 
@@ -177,7 +177,7 @@ public:
 
     EndpointIPtr endpoint() const;
     std::list<Ice::ConnectionIPtr> connections() const;
-    void flushAsyncBatchRequests(const CommunicatorFlushBatchPtr&);
+    void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&);
 
     //
     // Operations from EventHandler
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 1c22af06bb8..734e9c48695 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -27,6 +27,7 @@
 #include <Ice/RequestHandler.h> // For RetryException
 #include <Ice/ReferenceFactory.h> // For createProxy().
 #include <Ice/ProxyFactory.h> // For createProxy().
+#include <Ice/BatchRequestQueue.h>
 
 #ifdef ICE_HAS_BZIP2
 #  include <bzlib.h>
@@ -71,7 +72,7 @@ public:
     DispatchCall(const ConnectionIPtr& connection, const ConnectionI::StartCallbackPtr& startCB,
                  const vector<ConnectionI::OutgoingMessage>& sentCBs, Byte compress, Int requestId,
                  Int invokeNum, const ServantManagerPtr& servantManager, const ObjectAdapterPtr& adapter,
-                 const OutgoingAsyncPtr& outAsync, const ConnectionCallbackPtr& heartbeatCallback,
+                 const OutgoingAsyncBasePtr& outAsync, const ConnectionCallbackPtr& heartbeatCallback,
                  BasicStream& stream) :
         DispatchWorkItem(connection),
         _connection(connection),
@@ -106,7 +107,7 @@ private:
     const Int _invokeNum;
     const ServantManagerPtr _servantManager;
     const ObjectAdapterPtr _adapter;
-    const OutgoingAsyncPtr _outAsync;
+    const OutgoingAsyncBasePtr _outAsync;
     const ConnectionCallbackPtr _heartbeatCallback;
     BasicStream _stream;
 };
@@ -597,7 +598,7 @@ Ice::ConnectionI::monitor(const IceUtil::Time& now, const ACMConfig& acm)
             setState(StateClosed, ConnectionTimeoutException(__FILE__, __LINE__));
         }
         else if(acm.close != CloseOnInvocation &&
-                _dispatchCount == 0 && _batchStream.b.empty() && _requests.empty() && _asyncRequests.empty())
+                _dispatchCount == 0 && _batchRequestQueue->isEmpty() && _requests.empty() && _asyncRequests.empty())
         {
             //
             // The connection is idle, close it.
@@ -608,7 +609,7 @@ Ice::ConnectionI::monitor(const IceUtil::Time& now, const ACMConfig& acm)
 }
 
 bool
-Ice::ConnectionI::sendRequest(Outgoing* out, bool compress, bool response)
+Ice::ConnectionI::sendRequest(OutgoingBase* out, bool compress, bool response, int batchRequestNum)
 {
     BasicStream* os = out->os();
 
@@ -655,6 +656,15 @@ Ice::ConnectionI::sendRequest(Outgoing* out, bool compress, bool response)
         copy(p, p + sizeof(Int), os->b.begin() + headerSize);
 #endif
     }
+    else if(batchRequestNum > 0)
+    {
+        const Byte* p = reinterpret_cast<const Byte*>(&batchRequestNum);
+#ifdef ICE_BIG_ENDIAN
+        reverse_copy(p, p + sizeof(Int), os->b.begin() + headerSize);
+#else
+        copy(p, p + sizeof(Int), os->b.begin() + headerSize);
+#endif
+    }
 
     out->attachRemoteObserver(initConnectionInfo(), _endpoint, requestId);
 
@@ -680,14 +690,14 @@ Ice::ConnectionI::sendRequest(Outgoing* out, bool compress, bool response)
         //
         // Add to the requests map.
         //
-        _requestsHint = _requests.insert(_requests.end(), pair<const Int, Outgoing*>(requestId, out));
+        _requestsHint = _requests.insert(_requests.end(), pair<const Int, OutgoingBase*>(requestId, out));
     }
 
     return sent;
 }
 
 AsyncStatus
-Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncPtr& out, bool compress, bool response)
+Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncBasePtr& out, bool compress, bool response, int batchRequestNum)
 {
     BasicStream* os = out->getOs();
 
@@ -740,6 +750,15 @@ Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncPtr& out, bool compress, b
         copy(p, p + sizeof(Int), os->b.begin() + headerSize);
 #endif
     }
+    else if(batchRequestNum > 0)
+    {
+        const Byte* p = reinterpret_cast<const Byte*>(&batchRequestNum);
+#ifdef ICE_BIG_ENDIAN
+        reverse_copy(p, p + sizeof(Int), os->b.begin() + headerSize);
+#else
+        copy(p, p + sizeof(Int), os->b.begin() + headerSize);
+#endif
+    }
 
     out->attachRemoteObserver(initConnectionInfo(), _endpoint, requestId);
 
@@ -762,211 +781,21 @@ Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncPtr& out, bool compress, b
         // Add to the async requests map.
         //
         _asyncRequestsHint = _asyncRequests.insert(_asyncRequests.end(),
-                                                   pair<const Int, OutgoingAsyncPtr>(requestId, out));
+                                                   pair<const Int, OutgoingAsyncBasePtr>(requestId, out));
     }
     return status;
 }
 
-void
-Ice::ConnectionI::prepareBatchRequest(BasicStream* os)
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-
-    //
-    // Wait if flushing is currently in progress.
-    //
-    while(_batchStreamInUse && !_exception.get())
-    {
-        wait();
-    }
-
-    if(_exception.get())
-    {
-        //
-        // If there were no batch requests queued when the connection failed, we can safely
-        // retry with a new connection. Otherwise, we must throw to notify the caller that
-        // some previous batch requests were not sent.
-        //
-        if(_batchStream.b.empty())
-        {
-            throw RetryException(*_exception.get());
-        }
-        else
-        {
-            _exception->ice_throw();
-        }
-    }
-
-    assert(_state > StateNotValidated);
-    assert(_state < StateClosing);
-
-    if(_batchStream.b.empty())
-    {
-        try
-        {
-            _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr));
-        }
-        catch(const LocalException& ex)
-        {
-            setState(StateClosed, ex);
-            ex.ice_throw();
-        }
-    }
-
-    _batchStreamInUse = true;
-    _batchMarker = _batchStream.b.size();
-    _batchStream.swap(*os);
-
-    //
-    // The batch stream now belongs to the caller, until
-    // finishBatchRequest() or abortBatchRequest() is called.
-    //
-}
-
-void
-Ice::ConnectionI::finishBatchRequest(BasicStream* os, bool compress)
-{
-    try
-    {
-        IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-
-        //
-        // Get the batch stream back.
-        //
-        _batchStream.swap(*os);
-
-        if(_exception.get())
-        {
-            return;
-        }
-
-        bool flush = false;
-        if(_batchAutoFlushSize > 0)
-        {
-            if(_batchStream.b.size() > _batchAutoFlushSize)
-            {
-                flush = true;
-            }
-
-            //
-            // Throw memory limit exception if the first message added causes us to
-            // go over limit. Otherwise put aside the marshalled message that caused
-            // limit to be exceeded and rollback stream to the marker.
-            //
-            try
-            {
-                _transceiver->checkSendSize(_batchStream);
-            }
-            catch(const Ice::Exception&)
-            {
-                if(_batchRequestNum > 0)
-                {
-                    flush = true;
-                }
-                else
-                {
-                    throw;
-                }
-            }
-        }
-
-        if(flush)
-        {
-            //
-            // Temporarily save the last request.
-            //
-            vector<Ice::Byte> lastRequest(_batchStream.b.begin() + _batchMarker, _batchStream.b.end());
-            _batchStream.b.resize(_batchMarker);
-
-            //
-            // Send the batch stream without the last request.
-            //
-            try
-            {
-                //
-                // Fill in the number of requests in the batch.
-                //
-                const Byte* p = reinterpret_cast<const Byte*>(&_batchRequestNum);
-#ifdef ICE_BIG_ENDIAN
-                reverse_copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize);
-#else
-                copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize);
-#endif
-
-                OutgoingMessage message(&_batchStream, _batchRequestCompress);
-                sendMessage(message);
-            }
-            catch(const Ice::LocalException& ex)
-            {
-                setState(StateClosed, ex);
-                assert(_exception.get());
-                _exception->ice_throw();
-            }
-
-            //
-            // Reset the batch.
-            //
-            BasicStream dummy(_instance.get(), currentProtocolEncoding);
-            _batchStream.swap(dummy);
-            _batchRequestNum = 0;
-            _batchRequestCompress = false;
-            _batchMarker = 0;
-
-            //
-            // Start a new batch with the last message that caused us to go over the limit.
-            //
-            _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr));
-            _batchStream.writeBlob(&lastRequest[0], lastRequest.size());
-        }
-
-        //
-        // Increment the number of requests in the batch.
-        //
-        ++_batchRequestNum;
-
-        //
-        // We compress the whole batch if there is at least one compressed
-        // message.
-        //
-        if(compress)
-        {
-            _batchRequestCompress = true;
-        }
-
-        //
-        // Notify about the batch stream not being in use anymore.
-        //
-        assert(_batchStreamInUse);
-        _batchStreamInUse = false;
-        notifyAll();
-    }
-    catch(const Ice::LocalException&)
-    {
-        abortBatchRequest();
-        throw;
-    }
-}
-
-void
-Ice::ConnectionI::abortBatchRequest()
+BatchRequestQueuePtr
+Ice::ConnectionI::getBatchRequestQueue() const
 {
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-
-    BasicStream dummy(_instance.get(), currentProtocolEncoding);
-    _batchStream.swap(dummy);
-    _batchRequestNum = 0;
-    _batchRequestCompress = false;
-    _batchMarker = 0;
-
-    assert(_batchStreamInUse);
-    _batchStreamInUse = false;
-    notifyAll();
+    return _batchRequestQueue;
 }
 
 void
 Ice::ConnectionI::flushBatchRequests()
 {
-    FlushBatch out(this, _instance.get(), __flushBatchRequests_name);
+    ConnectionFlushBatch out(this, _instance.get(), __flushBatchRequests_name);
     out.invoke();
 }
 
@@ -1032,12 +861,12 @@ Ice::ConnectionI::begin_flushBatchRequests(const IceInternal::Function<void (con
 AsyncResultPtr
 Ice::ConnectionI::__begin_flushBatchRequests(const CallbackBasePtr& cb, const LocalObjectPtr& cookie)
 {
-    ConnectionFlushBatchPtr result = new ConnectionFlushBatch(this,
-                                                              _communicator,
-                                                              _instance,
-                                                              __flushBatchRequests_name,
-                                                              cb,
-                                                              cookie);
+    ConnectionFlushBatchAsyncPtr result = new ConnectionFlushBatchAsync(this,
+                                                                        _communicator,
+                                                                        _instance,
+                                                                        __flushBatchRequests_name,
+                                                                        cb,
+                                                                        cookie);
     result->invoke();
     return result;
 }
@@ -1049,136 +878,6 @@ Ice::ConnectionI::end_flushBatchRequests(const AsyncResultPtr& r)
     r->__wait();
 }
 
-bool
-Ice::ConnectionI::flushBatchRequests(OutgoingBase* out)
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-    while(_batchStreamInUse && !_exception.get())
-    {
-        wait();
-    }
-
-    if(_exception.get())
-    {
-        _exception->ice_throw();
-    }
-
-    if(_batchRequestNum == 0)
-    {
-        out->sent();
-        return true;
-    }
-
-    //
-    // Fill in the number of requests in the batch.
-    //
-    const Byte* p = reinterpret_cast<const Byte*>(&_batchRequestNum);
-#ifdef ICE_BIG_ENDIAN
-    reverse_copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize);
-#else
-    copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize);
-#endif
-    _batchStream.swap(*out->os());
-
-    out->attachRemoteObserver(initConnectionInfo(), _endpoint, 0);
-
-    //
-    // Send the batch stream.
-    //
-    bool sent = false;
-    try
-    {
-        OutgoingMessage message(out, out->os(), _batchRequestCompress, 0);
-        sent = sendMessage(message) & AsyncStatusSent;
-    }
-    catch(const Ice::LocalException& ex)
-    {
-        setState(StateClosed, ex);
-        assert(_exception.get());
-        _exception->ice_throw();
-    }
-
-    //
-    // Reset the batch stream.
-    //
-    BasicStream dummy(_instance.get(), Ice::currentProtocolEncoding);
-    _batchStream.swap(dummy);
-    _batchRequestNum = 0;
-    _batchRequestCompress = false;
-    _batchMarker = 0;
-    return sent;
-}
-
-AsyncStatus
-Ice::ConnectionI::flushAsyncBatchRequests(const OutgoingAsyncBasePtr& outAsync)
-{
-    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-    while(_batchStreamInUse && !_exception.get())
-    {
-        wait();
-    }
-
-    if(_exception.get())
-    {
-        _exception->ice_throw();
-    }
-
-    if(_batchRequestNum == 0)
-    {
-        AsyncStatus status = AsyncStatusSent;
-        if(outAsync->sent())
-        {
-            status = static_cast<AsyncStatus>(status | AsyncStatusInvokeSentCallback);
-        }
-        return status;
-    }
-
-    //
-    // Notify the request that it's cancelable with this connection.
-    // This will throw if the request is canceled.
-    //
-    outAsync->cancelable(this);
-
-    //
-    // Fill in the number of requests in the batch.
-    //
-    const Byte* p = reinterpret_cast<const Byte*>(&_batchRequestNum);
-#ifdef ICE_BIG_ENDIAN
-    reverse_copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize);
-#else
-    copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize);
-#endif
-    _batchStream.swap(*outAsync->getOs());
-
-    outAsync->attachRemoteObserver(initConnectionInfo(), _endpoint, 0);
-
-    //
-    // Send the batch stream.
-    //
-    AsyncStatus status = AsyncStatusQueued;
-    try
-    {
-        OutgoingMessage message(outAsync, outAsync->getOs(), _batchRequestCompress, 0);
-        status = sendMessage(message);
-    }
-    catch(const Ice::LocalException& ex)
-    {
-        setState(StateClosed, ex);
-        assert(_exception.get());
-        _exception->ice_throw();
-    }
-
-    //
-    // Reset the batch stream.
-    //
-    BasicStream dummy(_instance.get(), Ice::currentProtocolEncoding);
-    _batchStream.swap(dummy);
-    _batchRequestNum = 0;
-    _batchRequestCompress = false;
-    _batchMarker = 0;
-    return status;
-}
-
 void
 Ice::ConnectionI::setCallback(const ConnectionCallbackPtr& callback)
 {
@@ -1295,7 +994,7 @@ Ice::ConnectionI::requestCanceled(OutgoingBase* out, const Ice::LocalException&
         {
             if(o->requestId)
             {
-                if(_requestsHint != _requests.end() && _requestsHint->second == dynamic_cast<Outgoing*>(out))
+                if(_requestsHint != _requests.end() && _requestsHint->second == out)
                 {
                     _requests.erase(_requestsHint);
                     _requestsHint = _requests.end();
@@ -1331,10 +1030,9 @@ Ice::ConnectionI::requestCanceled(OutgoingBase* out, const Ice::LocalException&
         }
     }
 
-    Outgoing* o = dynamic_cast<Outgoing*>(out);
-    if(o)
+    if(dynamic_cast<Outgoing*>(out))
     {
-        if(_requestsHint != _requests.end() && _requestsHint->second == o)
+        if(_requestsHint != _requests.end() && _requestsHint->second == out)
         {
             if(dynamic_cast<const Ice::ConnectionTimeoutException*>(&ex))
             {
@@ -1342,7 +1040,7 @@ Ice::ConnectionI::requestCanceled(OutgoingBase* out, const Ice::LocalException&
             }
             else
             {
-                o->completed(ex);
+                out->completed(ex);
                 _requests.erase(_requestsHint);
                 _requestsHint = _requests.end();
             }
@@ -1350,9 +1048,9 @@ Ice::ConnectionI::requestCanceled(OutgoingBase* out, const Ice::LocalException&
         }
         else
         {
-            for(map<Int, Outgoing*>::iterator p = _requests.begin(); p != _requests.end(); ++p)
+            for(map<Int, OutgoingBase*>::iterator p = _requests.begin(); p != _requests.end(); ++p)
             {
-                if(p->second == o)
+                if(p->second == out)
                 {
                     if(dynamic_cast<const Ice::ConnectionTimeoutException*>(&ex))
                     {
@@ -1360,7 +1058,7 @@ Ice::ConnectionI::requestCanceled(OutgoingBase* out, const Ice::LocalException&
                     }
                     else
                     {
-                        o->completed(ex);
+                        p->second->completed(ex);
                         assert(p != _requestsHint);
                         _requests.erase(p);
                     }
@@ -1430,12 +1128,11 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con
         }
     }
 
-    OutgoingAsyncPtr o = OutgoingAsyncPtr::dynamicCast(outAsync);
-    if(o)
+    if(OutgoingAsyncPtr::dynamicCast(outAsync))
     {
         if(_asyncRequestsHint != _asyncRequests.end())
         {
-            if(_asyncRequestsHint->second == o)
+            if(_asyncRequestsHint->second == outAsync)
             {
                 if(dynamic_cast<const Ice::ConnectionTimeoutException*>(&ex))
                 {
@@ -1454,9 +1151,9 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con
             }
         }
 
-        for(map<Int, OutgoingAsyncPtr>::iterator p = _asyncRequests.begin(); p != _asyncRequests.end(); ++p)
+        for(map<Int, OutgoingAsyncBasePtr>::iterator p = _asyncRequests.begin(); p != _asyncRequests.end(); ++p)
         {
-            if(p->second.get() == o.get())
+            if(p->second.get() == outAsync.get())
             {
                 if(dynamic_cast<const Ice::ConnectionTimeoutException*>(&ex))
                 {
@@ -1769,7 +1466,7 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
     Int invokeNum = 0;
     ServantManagerPtr servantManager;
     ObjectAdapterPtr adapter;
-    OutgoingAsyncPtr outAsync;
+    OutgoingAsyncBasePtr outAsync;
     ConnectionCallbackPtr heartbeatCallback;
     int dispatchCount = 0;
 
@@ -2039,7 +1736,7 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
 void
 ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMessage>& sentCBs,
                       Byte compress, Int requestId, Int invokeNum, const ServantManagerPtr& servantManager,
-                      const ObjectAdapterPtr& adapter, const OutgoingAsyncPtr& outAsync,
+                      const ObjectAdapterPtr& adapter, const OutgoingAsyncBasePtr& outAsync,
                       const ConnectionCallbackPtr& heartbeatCallback, BasicStream& stream)
 {
     int dispatchedCount = 0;
@@ -2290,13 +1987,13 @@ Ice::ConnectionI::finish(bool close)
         _sendStreams.clear(); // Must be cleared before _requests because of Outgoing* references in OutgoingMessage
     }
 
-    for(map<Int, Outgoing*>::const_iterator p = _requests.begin(); p != _requests.end(); ++p)
+    for(map<Int, OutgoingBase*>::const_iterator p = _requests.begin(); p != _requests.end(); ++p)
     {
         p->second->completed(*_exception.get());
     }
     _requests.clear();
 
-    for(map<Int, OutgoingAsyncPtr>::const_iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q)
+    for(map<Int, OutgoingAsyncBasePtr>::const_iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q)
     {
         if(q->second->completed(*_exception.get()))
         {
@@ -2429,12 +2126,7 @@ Ice::ConnectionI::ConnectionI(const CommunicatorPtr& communicator,
     _requestsHint(_requests.end()),
     _asyncRequestsHint(_asyncRequests.end()),
     _messageSizeMax(adapter ? adapter->messageSizeMax() : _instance->messageSizeMax()),
-    _batchAutoFlushSize(_instance->batchAutoFlushSize()),
-    _batchStream(_instance.get(), Ice::currentProtocolEncoding),
-    _batchStreamInUse(false),
-    _batchRequestNum(0),
-    _batchRequestCompress(false),
-    _batchMarker(0),
+    _batchRequestQueue(new BatchRequestQueue(instance, endpoint->datagram())),
     _readStream(_instance.get(), Ice::currentProtocolEncoding),
     _readHeader(false),
     _writeStream(_instance.get(), Ice::currentProtocolEncoding),
@@ -2647,6 +2339,8 @@ Ice::ConnectionI::setState(State state)
                 return;
             }
 
+            _batchRequestQueue->destroy(*_exception.get());
+
             //
             // Don't need to close now for connections so only close the transceiver
             // if the selector request it.
@@ -3431,7 +3125,7 @@ Ice::ConnectionI::doUncompress(BasicStream& compressed, BasicStream& uncompresse
 SocketOperation
 Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& requestId, Byte& compress,
                                ServantManagerPtr& servantManager, ObjectAdapterPtr& adapter,
-                               OutgoingAsyncPtr& outAsync, ConnectionCallbackPtr& heartbeatCallback,
+                               OutgoingAsyncBasePtr& outAsync, ConnectionCallbackPtr& heartbeatCallback,
                                int& dispatchCount)
 {
     assert(_state > StateNotValidated && _state < StateClosed);
@@ -3556,8 +3250,8 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request
 
                 stream.read(requestId);
 
-                map<Int, Outgoing*>::iterator p = _requests.end();
-                map<Int, OutgoingAsyncPtr>::iterator q = _asyncRequests.end();
+                map<Int, OutgoingBase*>::iterator p = _requests.end();
+                map<Int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.end();
 
                 if(_requestsHint != _requests.end())
                 {
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index adcdd8ea318..aeedf315342 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -36,6 +36,7 @@
 #include <Ice/Dispatcher.h>
 #include <Ice/ObserverHelper.h>
 #include <Ice/ConnectionAsync.h>
+#include <Ice/BatchRequestQueueF.h>
 #include <Ice/ACM.h>
 
 #include <deque>
@@ -166,12 +167,10 @@ public:
 
     void monitor(const IceUtil::Time&, const IceInternal::ACMConfig&);
 
-    bool sendRequest(IceInternal::Outgoing*, bool, bool);
-    IceInternal::AsyncStatus sendAsyncRequest(const IceInternal::OutgoingAsyncPtr&, bool, bool);
+    bool sendRequest(IceInternal::OutgoingBase*, bool, bool, int);
+    IceInternal::AsyncStatus sendAsyncRequest(const IceInternal::OutgoingAsyncBasePtr&, bool, bool, int);
 
-    void prepareBatchRequest(IceInternal::BasicStream*);
-    void finishBatchRequest(IceInternal::BasicStream*, bool);
-    void abortBatchRequest();
+    IceInternal::BatchRequestQueuePtr getBatchRequestQueue() const;
 
     virtual void flushBatchRequests(); // From Connection.
 
@@ -186,9 +185,6 @@ public:
 
     virtual void end_flushBatchRequests(const AsyncResultPtr&);
 
-    bool flushBatchRequests(IceInternal::OutgoingBase*);
-    IceInternal::AsyncStatus flushAsyncBatchRequests(const IceInternal::OutgoingAsyncBasePtr&);
-
     virtual void setCallback(const ConnectionCallbackPtr&);
     virtual void setACM(const IceUtil::Optional<int>&,
                         const IceUtil::Optional<ACMClose>&,
@@ -235,7 +231,8 @@ public:
     void exception(const LocalException&);
 
     void dispatch(const StartCallbackPtr&, const std::vector<OutgoingMessage>&, Byte, Int, Int,
-                  const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&, const IceInternal::OutgoingAsyncPtr&,
+                  const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&,
+                  const IceInternal::OutgoingAsyncBasePtr&,
                   const ConnectionCallbackPtr&, IceInternal::BasicStream&);
     void finish(bool);
 
@@ -280,7 +277,7 @@ private:
 #endif
     IceInternal::SocketOperation parseMessage(IceInternal::BasicStream&, Int&, Int&, Byte&,
                                               IceInternal::ServantManagerPtr&, ObjectAdapterPtr&,
-                                              IceInternal::OutgoingAsyncPtr&, ConnectionCallbackPtr&, int&);
+                                              IceInternal::OutgoingAsyncBasePtr&, ConnectionCallbackPtr&, int&);
     void invokeAll(IceInternal::BasicStream&, Int, Int, Byte,
                    const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&);
 
@@ -333,21 +330,16 @@ private:
 
     Int _nextRequestId;
 
-    std::map<Int, IceInternal::Outgoing*> _requests;
-    std::map<Int, IceInternal::Outgoing*>::iterator _requestsHint;
+    std::map<Int, IceInternal::OutgoingBase*> _requests;
+    std::map<Int, IceInternal::OutgoingBase*>::iterator _requestsHint;
 
-    std::map<Int, IceInternal::OutgoingAsyncPtr> _asyncRequests;
-    std::map<Int, IceInternal::OutgoingAsyncPtr>::iterator _asyncRequestsHint;
+    std::map<Int, IceInternal::OutgoingAsyncBasePtr> _asyncRequests;
+    std::map<Int, IceInternal::OutgoingAsyncBasePtr>::iterator _asyncRequestsHint;
 
     IceUtil::UniquePtr<LocalException> _exception;
 
     const size_t _messageSizeMax;
-    const size_t _batchAutoFlushSize;
-    IceInternal::BasicStream _batchStream;
-    bool _batchStreamInUse;
-    int _batchRequestNum;
-    bool _batchRequestCompress;
-    size_t _batchMarker;
+    IceInternal::BatchRequestQueuePtr _batchRequestQueue;
 
     std::deque<OutgoingMessage> _sendStreams;
 
diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp
index f6d0adf7ae8..cab544915e6 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectionRequestHandler.cpp
@@ -28,12 +28,6 @@ ConnectionRequestHandler::ConnectionRequestHandler(const ReferencePtr& reference
 }
 
 RequestHandlerPtr
-ConnectionRequestHandler::connect(const Ice::ObjectPrx&)
-{
-    return this;
-}
-
-RequestHandlerPtr
 ConnectionRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler)
 {
     assert(previousHandler);
@@ -60,34 +54,16 @@ ConnectionRequestHandler::update(const RequestHandlerPtr& previousHandler, const
     return this;
 }
 
-void
-ConnectionRequestHandler::prepareBatchRequest(BasicStream* out)
-{
-    _connection->prepareBatchRequest(out);
-}
-
-void
-ConnectionRequestHandler::finishBatchRequest(BasicStream* out)
-{
-    _connection->finishBatchRequest(out, _compress);
-}
-
-void
-ConnectionRequestHandler::abortBatchRequest()
-{
-    _connection->abortBatchRequest();
-}
-
 bool
-ConnectionRequestHandler::sendRequest(OutgoingBase* out)
+ConnectionRequestHandler::sendRequest(ProxyOutgoingBase* out)
 {
-    return out->send(_connection, _compress, _response) && !_response; // Finished if sent and no response
+    return out->invokeRemote(_connection, _compress, _response) && !_response; // Finished if sent and no response
 }
 
 AsyncStatus
-ConnectionRequestHandler::sendAsyncRequest(const OutgoingAsyncBasePtr& out)
+ConnectionRequestHandler::sendAsyncRequest(const ProxyOutgoingAsyncBasePtr& out)
 {
-    return out->send(_connection, _compress, _response);
+    return out->invokeRemote(_connection, _compress, _response);
 }
 
 void
diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h
index b560ab0f7cc..cef3df68f4d 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.h
+++ b/cpp/src/Ice/ConnectionRequestHandler.h
@@ -23,15 +23,10 @@ public:
 
     ConnectionRequestHandler(const ReferencePtr&, const Ice::ConnectionIPtr&, bool);
 
-    virtual RequestHandlerPtr connect(const Ice::ObjectPrx&);
     virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&);
 
-    virtual void prepareBatchRequest(BasicStream*);
-    virtual void finishBatchRequest(BasicStream*);
-    virtual void abortBatchRequest();
-
-    virtual bool sendRequest(OutgoingBase*);
-    virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncBasePtr&);
+    virtual bool sendRequest(ProxyOutgoingBase*);
+    virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&);
 
     virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&);
     virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&);
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 3fa6474aa7b..0db2702359a 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -84,28 +84,30 @@ IceInternal::IncomingBase::__adopt(IncomingBase& other)
     other._responseHandler = 0;
 }
 
-BasicStream* 
+BasicStream*
 IncomingBase::__startWriteParams(FormatType format)
 {
-    if(_response)
+    if(!_response)
     {
-        assert(_os.b.size() == headerSize + 4); // Reply status position.
-        assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known.
-        _os.write(static_cast<Ice::Byte>(0));
-        _os.startWriteEncaps(_current.encoding, format);
+        throw MarshalException(__FILE__, __LINE__, "can't marshal out parameters for oneway dispatch");
     }
-    
+
+    assert(_os.b.size() == headerSize + 4); // Reply status position.
+    assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known.
+    _os.write(static_cast<Ice::Byte>(0));
+    _os.startWriteEncaps(_current.encoding, format);
+
     //
     // We still return the stream even if no response is expected. The
     // servant code might still write some out parameters if for
     // example a method with out parameters somehow and erroneously
-    // invoked as oneway (or if the invocation is invoked on a 
+    // invoked as oneway (or if the invocation is invoked on a
     // blobject and the blobject erroneously writes a response).
     //
     return &_os;
 }
 
-void 
+void
 IncomingBase::__endWriteParams(bool ok)
 {
     if(!ok)
@@ -120,7 +122,7 @@ IncomingBase::__endWriteParams(bool ok)
     }
 }
 
-void 
+void
 IncomingBase::__writeEmptyParams()
 {
     if(_response)
@@ -132,7 +134,7 @@ IncomingBase::__writeEmptyParams()
     }
 }
 
-void 
+void
 IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok)
 {
     if(!ok)
@@ -156,7 +158,7 @@ IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok)
     }
 }
 
-void 
+void
 IncomingBase::__writeUserException(const Ice::UserException& ex, Ice::FormatType format)
 {
     ::IceInternal::BasicStream* __os = __startWriteParams(format);
@@ -479,7 +481,7 @@ IceInternal::IncomingBase::__handleException(bool amd)
 }
 
 
-IceInternal::Incoming::Incoming(Instance* instance, ResponseHandler* responseHandler, Ice::Connection* connection, 
+IceInternal::Incoming::Incoming(Instance* instance, ResponseHandler* responseHandler, Ice::Connection* connection,
                                 const ObjectAdapterPtr& adapter, bool response, Byte compress, Int requestId) :
     IncomingBase(instance, responseHandler, connection, adapter, response, compress, requestId),
     _inParamPos(0)
@@ -490,7 +492,7 @@ IceInternal::Incoming::Incoming(Instance* instance, ResponseHandler* responseHan
     if(response)
     {
         _os.writeBlob(replyHdr, sizeof(replyHdr));
-        
+
         //
         // Add the request ID.
         //
@@ -603,10 +605,10 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre
 
     const CommunicatorObserverPtr& obsv = _is->instance()->initializationData().observer;
     if(obsv)
-    { 
+    {
         // Read the parameter encapsulation size.
         Ice::Int sz;
-        _is->read(sz); 
+        _is->read(sz);
         _is->i -= 4;
 
         _observer.attach(obsv->getDispatchObserver(_current, static_cast<Int>(_is->i - start + sz)));
@@ -684,7 +686,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre
             // to indicate async dispatch.
             //
             if(_servant->__dispatch(*this, _current) == DispatchAsync)
-            {            
+            {
                 return;
             }
 
@@ -699,7 +701,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre
             // Skip the input parameters, this is required for reading
             // the next batch request if dispatching batch requests.
             //
-            _is->skipEncaps(); 
+            _is->skipEncaps();
 
             if(servantManager && servantManager->hasServant(_current.id))
             {
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index e17e405bf7b..0e286f99c0c 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -194,8 +194,8 @@ inline void checkIceVersion(Int version)
     {
         throw VersionMismatchException(__FILE__, __LINE__);
     }
-    
-#   endif    
+
+#   endif
 #endif
 }
 
@@ -381,17 +381,17 @@ Ice::newDispatcher(const ::std::function<void (const DispatcherCallPtr&, const C
     class Cpp11Dispatcher : public Dispatcher
     {
     public:
-        
+
         Cpp11Dispatcher(const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)>& cb) :
             _cb(cb)
         {
         }
-        
+
         virtual void dispatch(const DispatcherCallPtr& call, const ConnectionPtr& conn)
         {
             _cb(call, conn);
         }
-        
+
     private:
         const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)> _cb;
     };
@@ -399,3 +399,29 @@ Ice::newDispatcher(const ::std::function<void (const DispatcherCallPtr&, const C
     return new Cpp11Dispatcher(cb);
 }
 #endif
+
+#ifdef ICE_CPP11
+Ice::BatchRequestInterceptorPtr
+Ice::newBatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>& cb)
+{
+    class Cpp11BatchRequestInterceptor : public BatchRequestInterceptor
+    {
+    public:
+
+        Cpp11BatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>& cb) :
+            _cb(cb)
+        {
+        }
+
+        virtual void enqueue(const BatchRequest& request, int count, int size)
+        {
+            _cb(request, count, size);
+        }
+
+    private:
+        const ::std::function<void (const BatchRequest&, int, int)> _cb;
+    };
+
+    return new Cpp11BatchRequestInterceptor(cb);
+}
+#endif
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 94f87cc8d2e..e6f133ca4f9 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -60,6 +60,7 @@ OBJS	= Acceptor.o \
 	 	  AsyncResult.o \
 		  Base64.o \
 		  BasicStream.o \
+		  BatchRequestQueue.o \
 		  Buffer.o \
 		  CollocatedRequestHandler.o \
 		  CommunicatorI.o \
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index c32c98f573a..070185adbb3 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -62,6 +62,7 @@ OBJS	       =  .\Acceptor.obj \
 		  .\AsyncResult.obj \
 		  .\Base64.obj \
 		  .\BasicStream.obj \
+		  .\BatchRequestQueue.obj \
 		  .\Buffer.obj \
 		  .\CollocatedRequestHandler.obj \
 		  .\CommunicatorI.obj \
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index 5004a337b59..492ba389f70 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -27,7 +27,7 @@ IceInternal::ObjectAdapterFactory::shutdown()
 
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
-        
+
         //
         // Ignore shutdown requests if the object adapter factory has
         // already been shut down.
@@ -36,15 +36,15 @@ IceInternal::ObjectAdapterFactory::shutdown()
         {
             return;
         }
-        
+
         adapters = _adapters;
-        
+
         _instance = 0;
         _communicator = 0;
-        
+
         notifyAll();
     }
-    
+
     //
     // Deactivate outside the thread synchronization, to avoid
     // deadlocks.
@@ -59,7 +59,7 @@ IceInternal::ObjectAdapterFactory::waitForShutdown()
 
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
-        
+
         //
         // First we wait for the shutdown of the factory itself.
         //
@@ -167,7 +167,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
         {
             return 0;
         }
-        
+
         adapters = _adapters;
     }
 
@@ -211,7 +211,7 @@ IceInternal::ObjectAdapterFactory::removeObjectAdapter(const ObjectAdapterPtr& a
 }
 
 void
-IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchPtr& outAsync) const
+IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync) const
 {
     list<ObjectAdapterIPtr> adapters;
     {
diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h
index 1ab5d753d6a..6434a25b178 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.h
+++ b/cpp/src/Ice/ObjectAdapterFactory.h
@@ -33,7 +33,7 @@ public:
     ::Ice::ObjectAdapterPtr createObjectAdapter(const std::string&, const Ice::RouterPrx&);
     ::Ice::ObjectAdapterPtr findObjectAdapter(const ::Ice::ObjectPrx&);
     void removeObjectAdapter(const ::Ice::ObjectAdapterPtr&);
-    void flushAsyncBatchRequests(const CommunicatorFlushBatchPtr&) const;
+    void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&) const;
 
 private:
 
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 2c2472e1d00..b2e556991d0 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -738,7 +738,7 @@ Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const
 }
 
 void
-Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchPtr& outAsync)
+Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync)
 {
     vector<IncomingConnectionFactoryPtr> f;
     {
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index a0082608ad7..6ae147d9907 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -84,10 +84,10 @@ public:
 
     virtual EndpointSeq getEndpoints() const;
     virtual EndpointSeq getPublishedEndpoints() const;
-    
+
     bool isLocal(const ObjectPrx&) const;
 
-    void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchPtr&);
+    void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchAsyncPtr&);
 
     void updateConnectionObservers();
     void updateThreadObservers();
@@ -102,12 +102,12 @@ public:
 
 private:
 
-    ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&, 
+    ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&,
                    const IceInternal::ObjectAdapterFactoryPtr&, const std::string&, bool);
     virtual ~ObjectAdapterI();
     void initialize(const RouterPrx&);
     friend class IceInternal::ObjectAdapterFactory;
-    
+
     ObjectPrx newProxy(const Identity&, const std::string&) const;
     ObjectPrx newDirectProxy(const Identity&, const std::string&) const;
     ObjectPrx newIndirectProxy(const Identity&, const std::string&, const std::string&) const;
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 3699c3ee29a..23cccd2708a 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -23,134 +23,29 @@ using namespace Ice;
 using namespace Ice::Instrumentation;
 using namespace IceInternal;
 
-OutgoingBase::OutgoingBase(Instance* instance, const string& operation) :
-    _os(instance, Ice::currentProtocolEncoding), _sent(false)
+OutgoingBase::OutgoingBase(Instance* instance) : _os(instance, Ice::currentProtocolEncoding), _sent(false)
 {
 }
 
-Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, OperationMode mode, const Context* context) :
-    OutgoingBase(proxy->__reference()->getInstance().get(), operation),
+ProxyOutgoingBase::ProxyOutgoingBase(IceProxy::Ice::Object* proxy, OperationMode mode) :
+    OutgoingBase(proxy->__reference()->getInstance().get()),
     _proxy(proxy),
     _mode(mode),
-    _state(StateUnsent),
-    _encoding(getCompatibleEncoding(proxy->__reference()->getEncoding())),
-    _is(proxy->__reference()->getInstance().get(), Ice::currentProtocolEncoding)
-{ 
-    checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol()));
-
-    _observer.attach(proxy, operation, context);
-
+    _state(StateUnsent)
+{
     int invocationTimeout = _proxy->__reference()->getInvocationTimeout();
     if(invocationTimeout > 0)
     {
         _invocationTimeoutDeadline = Time::now(Time::Monotonic) + Time::milliSeconds(invocationTimeout);
     }
-
-    switch(_proxy->__reference()->getMode())
-    {
-        case Reference::ModeTwoway:
-        case Reference::ModeOneway:
-        case Reference::ModeDatagram:
-        {
-            _os.writeBlob(requestHdr, sizeof(requestHdr));
-            break;
-        }
-
-        case Reference::ModeBatchOneway:
-        case Reference::ModeBatchDatagram:
-        {
-            while(true)
-            {
-                try
-                {
-                    _handler = proxy->__getRequestHandler();
-                    _handler->prepareBatchRequest(&_os);
-                    break;
-                }
-                catch(const RetryException&)
-                {
-                    _proxy->__setRequestHandler(_handler, 0); // Clear request handler and retry.
-                }
-                catch(const Ice::LocalException& ex)
-                {
-                    _observer.failed(ex.ice_name());
-                    _proxy->__setRequestHandler(_handler, 0); // Clear request handler
-                    throw;
-                }
-            }
-            break;
-        }
-    }
-
-    try
-    {
-        _os.write(_proxy->__reference()->getIdentity());
-
-        //
-        // For compatibility with the old FacetPath.
-        //
-        if(_proxy->__reference()->getFacet().empty())
-        {
-            _os.write(static_cast<string*>(0), static_cast<string*>(0));
-        }
-        else
-        {
-            string facet = _proxy->__reference()->getFacet();
-            _os.write(&facet, &facet + 1);
-        }
-
-        _os.write(operation, false);
-
-        _os.write(static_cast<Ice::Byte>(mode));
-
-        if(context != 0)
-        {
-            //
-            // Explicit context
-            //
-            _os.write(*context);
-        }
-        else
-        {
-            //
-            // Implicit context
-            //
-            const ImplicitContextIPtr& implicitContext = _proxy->__reference()->getInstance()->getImplicitContext();
-            const Context& prxContext = _proxy->__reference()->getContext()->getValue();
-            if(implicitContext == 0)
-            {
-                _os.write(prxContext);
-            }
-            else
-            {
-                implicitContext->write(prxContext, &_os);
-            }
-        }
-    }
-    catch(const LocalException& ex)
-    {
-        abort(ex);
-    }
 }
 
-Outgoing::~Outgoing()
-{
-}
-
-bool
-Outgoing::send(const Ice::ConnectionIPtr& connection, bool compress, bool response)
+ProxyOutgoingBase::~ProxyOutgoingBase()
 {
-    return connection->sendRequest(this, compress, response);
 }
 
 void
-Outgoing::invokeCollocated(CollocatedRequestHandler* handler)
-{
-    handler->invokeRequest(this);
-}
-
-void
-Outgoing::sent()
+ProxyOutgoingBase::sent()
 {
     Monitor<Mutex>::Lock sync(_monitor);
     if(_proxy->__reference()->getMode() != Reference::ModeTwoway)
@@ -162,14 +57,14 @@ Outgoing::sent()
     _monitor.notify();
 
     //
-    // NOTE: At this point the stack allocated Outgoing object can be destroyed 
+    // NOTE: At this point the stack allocated ProxyOutgoingBase object can be destroyed
     // since the notify() on the monitor will release the thread waiting on the
     // synchronous Ice call.
     //
 }
 
 void
-Outgoing::completed(const Ice::Exception& ex)
+ProxyOutgoingBase::completed(const Ice::Exception& ex)
 {
     Monitor<Mutex>::Lock sync(_monitor);
     //assert(_state <= StateInProgress);
@@ -197,7 +92,13 @@ Outgoing::completed(const Ice::Exception& ex)
 }
 
 void
-Outgoing::retryException(const Ice::Exception&)
+ProxyOutgoingBase::completed(BasicStream& is)
+{
+    assert(false); // Must be overriden
+}
+
+void
+ProxyOutgoingBase::retryException(const Ice::Exception&)
 {
     Monitor<Mutex>::Lock sync(_monitor);
     assert(_state <= StateInProgress);
@@ -206,22 +107,14 @@ Outgoing::retryException(const Ice::Exception&)
 }
 
 bool
-Outgoing::invoke()
+ProxyOutgoingBase::invokeImpl()
 {
     assert(_state == StateUnsent);
-    
-    const Reference::Mode mode = _proxy->__reference()->getMode();
-    if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram)
-    {
-        _state = StateInProgress;
-        _handler->finishBatchRequest(&_os);
-        return true;
-    }
 
     const int invocationTimeout = _proxy->__reference()->getInvocationTimeout();
     int cnt = 0;
     while(true)
-    {        
+    {
         try
         {
             if(invocationTimeout > 0 && _invocationTimeoutDeadline <= Time::now(Time::Monotonic))
@@ -256,7 +149,7 @@ Outgoing::invoke()
                 {
                 }
             }
-                    
+
             bool timedOut = false;
             {
                 Monitor<Mutex>::Lock sync(_monitor);
@@ -274,7 +167,7 @@ Outgoing::invoke()
                             break;
                         }
                         _monitor.timedWait(_invocationTimeoutDeadline - now);
-                            
+
                         if((_state == StateInProgress || !_sent) && _state != StateFailed)
                         {
                             now = Time::now(Time::Monotonic);
@@ -290,7 +183,7 @@ Outgoing::invoke()
                     }
                 }
             }
-                
+
             if(timedOut)
             {
                 if(invocationTimeout == -2)
@@ -304,8 +197,8 @@ Outgoing::invoke()
 
                 //
                 // Wait for the exception to propagate. It's possible the request handler ignores
-                // the timeout if there was a failure shortly before requestCanceled got called. 
-                // In this case, the exception should be set on the Outgoing.
+                // the timeout if there was a failure shortly before requestCanceled got called.
+                // In this case, the exception should be set on the ProxyOutgoingBase.
                 //
                 Monitor<Mutex>::Lock sync(_monitor);
                 while(_state == StateInProgress)
@@ -313,14 +206,14 @@ Outgoing::invoke()
                     _monitor.wait();
                 }
             }
-                
+
             if(_exception.get())
             {
                 _exception->ice_throw();
             }
             else if(_state == StateRetry)
             {
-                _proxy->__setRequestHandler(_handler, 0); // Clear request handler and retry.
+                _proxy->__updateRequestHandler(_handler, 0); // Clear request handler and retry.
                 continue;
             }
             else
@@ -331,7 +224,7 @@ Outgoing::invoke()
         }
         catch(const RetryException&)
         {
-            _proxy->__setRequestHandler(_handler, 0); // Clear request handler and retry.
+            _proxy->__updateRequestHandler(_handler, 0); // Clear request handler and retry.
         }
         catch(const Ice::Exception& ex)
         {
@@ -348,8 +241,8 @@ Outgoing::invoke()
 
                         //
                         // Wait until either the retry and invocation timeout deadline is reached.
-                        // Note that we're using a loop here because sleep() precision isn't as 
-                        // good as the motonic clock and it can return few hundred micro-seconds 
+                        // Note that we're using a loop here because sleep() precision isn't as
+                        // good as the motonic clock and it can return few hundred micro-seconds
                         // earlier which breaks the check for the invocation timeout.
                         //
                         while(retryDeadline > now && _invocationTimeoutDeadline > now)
@@ -388,22 +281,129 @@ Outgoing::invoke()
     return false;
 }
 
+Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, OperationMode mode, const Context* context) :
+    ProxyOutgoingBase(proxy, mode),
+    _encoding(getCompatibleEncoding(proxy->__reference()->getEncoding())),
+    _is(proxy->__reference()->getInstance().get(), Ice::currentProtocolEncoding),
+    _operation(operation)
+{
+    checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol()));
+    _observer.attach(proxy, operation, context);
+
+    switch(_proxy->__reference()->getMode())
+    {
+        case Reference::ModeTwoway:
+        case Reference::ModeOneway:
+        case Reference::ModeDatagram:
+        {
+            _os.writeBlob(requestHdr, sizeof(requestHdr));
+            break;
+        }
+
+        case Reference::ModeBatchOneway:
+        case Reference::ModeBatchDatagram:
+        {
+            _proxy->__getBatchRequestQueue()->prepareBatchRequest(&_os);
+            break;
+        }
+    }
+
+    try
+    {
+        _os.write(_proxy->__reference()->getIdentity());
+
+        //
+        // For compatibility with the old FacetPath.
+        //
+        if(_proxy->__reference()->getFacet().empty())
+        {
+            _os.write(static_cast<string*>(0), static_cast<string*>(0));
+        }
+        else
+        {
+            string facet = _proxy->__reference()->getFacet();
+            _os.write(&facet, &facet + 1);
+        }
+
+        _os.write(operation, false);
+
+        _os.write(static_cast<Ice::Byte>(mode));
+
+        if(context != 0)
+        {
+            //
+            // Explicit context
+            //
+            _os.write(*context);
+        }
+        else
+        {
+            //
+            // Implicit context
+            //
+            const ImplicitContextIPtr& implicitContext = _proxy->__reference()->getInstance()->getImplicitContext();
+            const Context& prxContext = _proxy->__reference()->getContext()->getValue();
+            if(implicitContext == 0)
+            {
+                _os.write(prxContext);
+            }
+            else
+            {
+                implicitContext->write(prxContext, &_os);
+            }
+        }
+    }
+    catch(const LocalException& ex)
+    {
+        abort(ex);
+    }
+}
+
+Outgoing::~Outgoing()
+{
+}
+
+bool
+Outgoing::invokeRemote(const Ice::ConnectionIPtr& connection, bool compress, bool response)
+{
+    return connection->sendRequest(this, compress, response, 0);
+}
+
+void
+Outgoing::invokeCollocated(CollocatedRequestHandler* handler)
+{
+    handler->invokeRequest(this, 0);
+}
+
+bool
+Outgoing::invoke()
+{
+    const Reference::Mode mode = _proxy->__reference()->getMode();
+    if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram)
+    {
+        _state = StateInProgress;
+        _proxy->__getBatchRequestQueue()->finishBatchRequest(&_os, _proxy, _operation);
+        return true;
+    }
+    return invokeImpl();
+}
+
 void
 Outgoing::abort(const LocalException& ex)
 {
     assert(_state == StateUnsent);
-    
+
     //
     // If we didn't finish a batch oneway or datagram request, we must
     // notify the connection about that we give up ownership of the
     // batch stream.
     //
-    if(_proxy->__reference()->getMode() == Reference::ModeBatchOneway || 
-       _proxy->__reference()->getMode() == Reference::ModeBatchDatagram)
+    const Reference::Mode mode = _proxy->__reference()->getMode();
+    if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram)
     {
-        _handler->abortBatchRequest();
+        _proxy->__getBatchRequestQueue()->abortBatchRequest(&_os);
     }
-    
+
     ex.ice_throw();
 }
 
@@ -425,7 +425,7 @@ Outgoing::completed(BasicStream& is)
 
     Ice::Byte replyStatus;
     _is.read(replyStatus);
-    
+
     switch(replyStatus)
     {
         case replyOK:
@@ -433,14 +433,14 @@ Outgoing::completed(BasicStream& is)
             _state = StateOK; // The state must be set last, in case there is an exception.
             break;
         }
-        
+
         case replyUserException:
         {
             _observer.userException();
             _state = StateUserException; // The state must be set last, in case there is an exception.
             break;
         }
-        
+
         case replyObjectNotExist:
         case replyFacetNotExist:
         case replyOperationNotExist:
@@ -470,7 +470,7 @@ Outgoing::completed(BasicStream& is)
 
             string operation;
             _is.read(operation, false);
-            
+
             RequestFailedException* ex;
             switch(replyStatus)
             {
@@ -479,19 +479,19 @@ Outgoing::completed(BasicStream& is)
                     ex = new ObjectNotExistException(__FILE__, __LINE__);
                     break;
                 }
-                
+
                 case replyFacetNotExist:
                 {
                     ex = new FacetNotExistException(__FILE__, __LINE__);
                     break;
                 }
-                
+
                 case replyOperationNotExist:
                 {
                     ex = new OperationNotExistException(__FILE__, __LINE__);
                     break;
                 }
-                
+
                 default:
                 {
                     ex = 0; // To keep the compiler from complaining.
@@ -499,7 +499,7 @@ Outgoing::completed(BasicStream& is)
                     break;
                 }
             }
-            
+
             ex->id = ident;
             ex->facet = facet;
             ex->operation = operation;
@@ -508,7 +508,7 @@ Outgoing::completed(BasicStream& is)
             _state = StateLocalException; // The state must be set last, in case there is an exception.
             break;
         }
-        
+
         case replyUnknownException:
         case replyUnknownLocalException:
         case replyUnknownUserException:
@@ -520,7 +520,7 @@ Outgoing::completed(BasicStream& is)
             //
             string unknown;
             _is.read(unknown, false);
-            
+
             UnknownException* ex;
             switch(replyStatus)
             {
@@ -529,19 +529,19 @@ Outgoing::completed(BasicStream& is)
                     ex = new UnknownException(__FILE__, __LINE__);
                     break;
                 }
-                
+
                 case replyUnknownLocalException:
                 {
                     ex = new UnknownLocalException(__FILE__, __LINE__);
                     break;
                 }
-                
+
                 case replyUnknownUserException:
                 {
                     ex = new UnknownUserException(__FILE__, __LINE__);
                     break;
                 }
-                
+
                 default:
                 {
                     ex = 0; // To keep the compiler from complaining.
@@ -549,14 +549,14 @@ Outgoing::completed(BasicStream& is)
                     break;
                 }
             }
-            
+
             ex->unknown = unknown;
             _exception.reset(ex);
 
             _state = StateLocalException; // The state must be set last, in case there is an exception.
             break;
         }
-        
+
         default:
         {
             _exception.reset(new UnknownReplyStatusException(__FILE__, __LINE__));
@@ -583,145 +583,94 @@ Outgoing::throwUserException()
     }
 }
 
-FlushBatch::FlushBatch(IceProxy::Ice::Object* proxy, const string& operation) :
-    OutgoingBase(proxy->__reference()->getInstance().get(), operation), _proxy(proxy), _connection(0)
+ProxyFlushBatch::ProxyFlushBatch(IceProxy::Ice::Object* proxy, const string& operation) :
+    ProxyOutgoingBase(proxy, Ice::Normal)
 {
-    checkSupportedProtocol(proxy->__reference()->getProtocol());
+    checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol()));
+    _observer.attach(proxy, operation, 0);
 
-    _observer.attach(proxy->__reference()->getInstance().get(), operation);
+    _batchRequestNum = proxy->__getBatchRequestQueue()->swap(&_os);
 }
 
-FlushBatch::FlushBatch(ConnectionI* connection, Instance* instance, const string& operation) :
-    OutgoingBase(instance, operation), _proxy(0), _connection(connection)
+bool
+ProxyFlushBatch::invokeRemote(const Ice::ConnectionIPtr& connection, bool compress, bool response)
 {
-    _observer.attach(instance, operation);
+    return connection->sendRequest(this, compress, response, _batchRequestNum);
 }
 
 void
-FlushBatch::invoke()
+ProxyFlushBatch::invokeCollocated(CollocatedRequestHandler* handler)
 {
-    assert(_proxy || _connection);
+    handler->invokeRequest(this, _batchRequestNum);
+}
 
-    if(_connection)
+void
+ProxyFlushBatch::invoke()
+{
+    if(_batchRequestNum == 0)
     {
-        if(_connection->flushBatchRequests(this))
-        {
-            return;
-        }
-
-        Monitor<Mutex>::Lock sync(_monitor);
-        while(!_exception.get() && !_sent)
-        {
-            _monitor.wait();
-        }
-        if(_exception.get())
-        {
-            _exception->ice_throw();
-        }
-        return;
+        sent();
     }
+    else
+    {
+        invokeImpl();
+    }
+}
+
+ConnectionFlushBatch::ConnectionFlushBatch(ConnectionI* connection, Instance* instance, const string& operation) :
+    OutgoingBase(instance), _connection(connection)
+{
+    _observer.attach(instance, operation);
+}
+
+void
+ConnectionFlushBatch::invoke()
+{
+    int batchRequestNum = _connection->getBatchRequestQueue()->swap(&_os);
 
-    RequestHandlerPtr handler;
     try
     {
-        handler = _proxy->__getRequestHandler();
-        if(handler->sendRequest(this))
+        if(batchRequestNum == 0)
         {
-            return;
+            sent();
         }
-
-        bool timedOut = false;
+        else if(!_connection->sendRequest(this, false, false, batchRequestNum))
         {
             Monitor<Mutex>::Lock sync(_monitor);
-            int timeout = _proxy->__reference()->getInvocationTimeout();
-            if(timeout > 0)
-            {
-                Time now = Time::now(Time::Monotonic);
-                Time deadline = now + Time::milliSeconds(timeout);
-                while(!_exception.get() && !_sent && !timedOut)
-                {
-                    _monitor.timedWait(deadline - now);                
-                    if(!_exception.get() && !_sent)
-                    {
-                        now = Time::now(Time::Monotonic);
-                        timedOut = now >= deadline;
-                    }
-                }
-            }
-            else
-            {
-                while(!_exception.get() && !_sent)
-                {
-                    _monitor.wait();
-                }
-            }
-        }
-
-        if(timedOut)
-        {
-            Ice::InvocationTimeoutException ex(__FILE__, __LINE__);
-            handler->requestCanceled(this, ex);
-
-            //
-            // Wait for the exception to propagate. It's possible the request handler ignores
-            // the timeout if there was a failure shortly before requestTimedOut got called. 
-            // In this case, the exception should be set on the Outgoing.
-            //
-            Monitor<Mutex>::Lock sync(_monitor);
             while(!_exception.get() && !_sent)
             {
                 _monitor.wait();
             }
-        }
-    
-        if(_exception.get())
-        {
-            _exception->ice_throw();
+            if(_exception.get())
+            {
+                _exception->ice_throw();
+            }
         }
     }
     catch(const RetryException& ex)
     {
-        _proxy->__setRequestHandler(handler, 0); // Clear request handler
-        ex.get()->ice_throw(); // Throw to notify the user that batch requests were potentially lost.
+        ex.get()->ice_throw();
     }
-    catch(const Ice::Exception& ex)
-    {
-        _proxy->__setRequestHandler(handler, 0); // Clear request handler
-        _observer.failed(ex.ice_name());
-        throw; // Throw to notify the user that batch requests were potentially lost.
-    }
-}
-
-bool
-FlushBatch::send(const Ice::ConnectionIPtr& connection, bool, bool)
-{
-    return connection->flushBatchRequests(this);
-}
-
-void
-FlushBatch::invokeCollocated(CollocatedRequestHandler* handler)
-{
-    handler->invokeBatchRequests(this);
 }
 
 void
-FlushBatch::sent()
+ConnectionFlushBatch::sent()
 {
     Monitor<Mutex>::Lock sync(_monitor);
     _childObserver.detach();
-    
+
     _sent = true;
     _monitor.notify();
 
     //
-    // NOTE: At this point the stack allocated FlushBatch object
-    // can be destroyed since the notify() on the monitor will release
-    // the thread waiting on the synchronous Ice call.
+    // NOTE: At this point the stack allocated ConnectionFlushBatch
+    // object can be destroyed since the notify() on the monitor will
+    // release the thread waiting on the synchronous Ice call.
     //
 }
 
 void
-FlushBatch::completed(const Ice::Exception& ex)
+ConnectionFlushBatch::completed(const Ice::Exception& ex)
 {
     Monitor<Mutex>::Lock sync(_monitor);
     _childObserver.failed(ex.ice_name());
@@ -731,7 +680,13 @@ FlushBatch::completed(const Ice::Exception& ex)
 }
 
 void
-FlushBatch::retryException(const Ice::Exception& ex)
+ConnectionFlushBatch::completed(BasicStream& is)
+{
+    assert(false);
+}
+
+void
+ConnectionFlushBatch::retryException(const Ice::Exception& ex)
 {
     completed(ex);
 }
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index f32e5f3b547..513ba5b287d 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -26,7 +26,7 @@ using namespace IceInternal;
 IceUtil::Shared* IceInternal::upCast(OutgoingAsyncBase* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(ProxyOutgoingAsyncBase* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(OutgoingAsync* p) { return p; }
-IceUtil::Shared* IceInternal::upCast(CommunicatorFlushBatch* p) { return p; }
+IceUtil::Shared* IceInternal::upCast(CommunicatorFlushBatchAsync* p) { return p; }
 
 bool
 OutgoingAsyncBase::sent()
@@ -40,10 +40,17 @@ OutgoingAsyncBase::completed(const Exception& ex)
     return finished(ex);
 }
 
-void
-OutgoingAsyncBase::retryException(const Exception& ex)
+bool
+OutgoingAsyncBase::completed()
+{
+    assert(false); // Must be overriden by request that can handle responses
+    return false;
+}
+
+BasicStream*
+OutgoingAsyncBase::getIs()
 {
-    assert(false);
+    return 0; // Must be overriden by request that can handle responses
 }
 
 OutgoingAsyncBase::OutgoingAsyncBase(const CommunicatorPtr& communicator,
@@ -129,7 +136,7 @@ ProxyOutgoingAsyncBase::retryException(const Exception& ex)
         // require could end up waiting for the flush of the
         // connection to be done.
         //
-        handleRetryException(ex);
+        _proxy->__updateRequestHandler(_handler, 0); // Clear request handler and always retry.
         _instance->retryQueue()->add(this, 0);
     }
     catch(const Ice::Exception& exc)
@@ -238,9 +245,9 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread)
                 }
                 return; // We're done!
             }
-            catch(const RetryException& ex)
+            catch(const RetryException&)
             {
-                handleRetryException(*ex.get());
+                _proxy->__updateRequestHandler(_handler, 0); // Clear request handler and always retry.
             }
             catch(const Exception& ex)
             {
@@ -267,8 +274,8 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread)
         //
         // If called from the user thread we re-throw, the exception
         // will be catch by the caller and abort() will be called.
-        // 
-        if(userThread) 
+        //
+        if(userThread)
         {
             throw;
         }
@@ -313,12 +320,6 @@ ProxyOutgoingAsyncBase::finished(bool ok)
     return AsyncResult::finished(ok);
 }
 
-void
-ProxyOutgoingAsyncBase::handleRetryException(const Ice::Exception&)
-{
-    _proxy->__setRequestHandler(_handler, 0); // Clear request handler and always retry.
-}
-
 int
 ProxyOutgoingAsyncBase::handleException(const Exception& exc)
 {
@@ -338,8 +339,8 @@ ProxyOutgoingAsyncBase::runTimerTask()
     }
 }
 
-OutgoingAsync::OutgoingAsync(const ObjectPrx& prx, 
-                             const string& operation, 
+OutgoingAsync::OutgoingAsync(const ObjectPrx& prx,
+                             const string& operation,
                              const CallbackBasePtr& delegate,
                              const LocalObjectPtr& cookie) :
     ProxyOutgoingAsyncBase(prx, operation, delegate, cookie),
@@ -368,26 +369,7 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex
         case Reference::ModeBatchOneway:
         case Reference::ModeBatchDatagram:
         {
-            while(true)
-            {
-                try
-                {
-                    _handler = _proxy->__getRequestHandler();
-                    _handler->prepareBatchRequest(&_os);
-                    break;
-                }
-                catch(const RetryException&)
-                {
-                    _proxy->__setRequestHandler(_handler, 0); // Clear request handler and retry.
-                }
-                catch(const LocalException& ex)
-                {
-                    _observer.failed(ex.ice_name());
-                    _proxy->__setRequestHandler(_handler, 0); // Clear request handler
-                    _handler = 0;
-                    throw;
-                }
-            }
+            _proxy->__getBatchRequestQueue()->prepareBatchRequest(&_os);
             break;
         }
     }
@@ -445,16 +427,16 @@ OutgoingAsync::sent()
 }
 
 AsyncStatus
-OutgoingAsync::send(const ConnectionIPtr& connection, bool compress, bool response)
+OutgoingAsync::invokeRemote(const ConnectionIPtr& connection, bool compress, bool response)
 {
     _cachedConnection = connection;
-    return connection->sendAsyncRequest(this, compress, response);
+    return connection->sendAsyncRequest(this, compress, response, 0);
 }
 
 AsyncStatus
 OutgoingAsync::invokeCollocated(CollocatedRequestHandler* handler)
 {
-    return handler->invokeAsyncRequest(this);
+    return handler->invokeAsyncRequest(this, 0);
 }
 
 void
@@ -463,17 +445,14 @@ OutgoingAsync::abort(const Exception& ex)
     const Reference::Mode mode = _proxy->__reference()->getMode();
     if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram)
     {
-        if(_handler)
-        {
-            //
-            // If we didn't finish a batch oneway or datagram request, we
-            // must notify the connection about that we give up ownership
-            // of the batch stream.
-            //
-            _handler->abortBatchRequest();
-        }
+        //
+        // If we didn't finish a batch oneway or datagram request, we
+        // must notify the connection about that we give up ownership
+        // of the batch stream.
+        //
+        _proxy->__getBatchRequestQueue()->abortBatchRequest(&_os);
     }
-    
+
     ProxyOutgoingAsyncBase::abort(ex);
 }
 
@@ -483,12 +462,9 @@ OutgoingAsync::invoke()
     const Reference::Mode mode = _proxy->__reference()->getMode();
     if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram)
     {
-        if(_handler)
-        {
-            _sentSynchronously = true;
-            _handler->finishBatchRequest(&_os);
-            finished(true);
-        }
+        _sentSynchronously = true;
+        _proxy->__getBatchRequestQueue()->finishBatchRequest(&_os, _proxy, getOperation());
+        finished(true);
         return; // Don't call sent/completed callback for batch AMI requests
     }
 
@@ -645,50 +621,58 @@ OutgoingAsync::completed()
     }
 }
 
-ProxyFlushBatch::ProxyFlushBatch(const ObjectPrx& proxy,
-                                 const string& operation,
-                                 const CallbackBasePtr& delegate,
-                                 const LocalObjectPtr& cookie) :
+ProxyFlushBatchAsync::ProxyFlushBatchAsync(const ObjectPrx& proxy,
+                                           const string& operation,
+                                           const CallbackBasePtr& delegate,
+                                           const LocalObjectPtr& cookie) :
     ProxyOutgoingAsyncBase(proxy, operation, delegate, cookie)
 {
     _observer.attach(proxy.get(), operation, 0);
+    _batchRequestNum = proxy->__getBatchRequestQueue()->swap(&_os);
 }
 
 AsyncStatus
-ProxyFlushBatch::send(const ConnectionIPtr& connection, bool, bool)
+ProxyFlushBatchAsync::invokeRemote(const ConnectionIPtr& connection, bool compress, bool)
 {
+    if(_batchRequestNum == 0)
+    {
+        if(sent())
+        {
+            return static_cast<AsyncStatus>(AsyncStatusSent | AsyncStatusInvokeSentCallback);
+        }
+        else
+        {
+            return AsyncStatusSent;
+        }
+    }
     _cachedConnection = connection;
-    return connection->flushAsyncBatchRequests(this);
+    return connection->sendAsyncRequest(this, compress, false, _batchRequestNum);
 }
 
 AsyncStatus
-ProxyFlushBatch::invokeCollocated(CollocatedRequestHandler* handler)
+ProxyFlushBatchAsync::invokeCollocated(CollocatedRequestHandler* handler)
 {
-    return handler->invokeAsyncBatchRequests(this);
+    if(_batchRequestNum == 0)
+    {
+        if(sent())
+        {
+            return static_cast<AsyncStatus>(AsyncStatusSent | AsyncStatusInvokeSentCallback);
+        }
+        else
+        {
+            return AsyncStatusSent;
+        }
+    }
+    return handler->invokeAsyncRequest(this, _batchRequestNum);
 }
 
 void
-ProxyFlushBatch::invoke()
+ProxyFlushBatchAsync::invoke()
 {
     checkSupportedProtocol(getCompatibleProtocol(_proxy->__reference()->getProtocol()));
     invokeImpl(true); // userThread = true
 }
 
-void
-ProxyFlushBatch::handleRetryException(const Ice::Exception& ex)
-{
-    _proxy->__setRequestHandler(_handler, 0); // Clear request handler
-    ex.ice_throw(); // No retries, we want to notify the user of potentially lost batch requests
-}
-
-int
-ProxyFlushBatch::handleException(const Exception& ex)
-{
-    _proxy->__setRequestHandler(_handler, 0); // Clear request handler
-    ex.ice_throw(); // No retries, we want to notify the user of potentially lost batch requests
-    return 0;
-}
-
 ProxyGetConnection::ProxyGetConnection(const ObjectPrx& prx,
                                        const string& operation,
                                        const CallbackBasePtr& delegate,
@@ -699,7 +683,7 @@ ProxyGetConnection::ProxyGetConnection(const ObjectPrx& prx,
 }
 
 AsyncStatus
-ProxyGetConnection::send(const ConnectionIPtr& connection, bool, bool)
+ProxyGetConnection::invokeRemote(const ConnectionIPtr& connection, bool, bool)
 {
     _cachedConnection = connection;
     if(finished(true))
@@ -725,29 +709,43 @@ ProxyGetConnection::invoke()
     invokeImpl(true); // userThread = true
 }
 
-ConnectionFlushBatch::ConnectionFlushBatch(const ConnectionIPtr& connection,
-                                           const CommunicatorPtr& communicator,
-                                           const InstancePtr& instance,
-                                           const string& operation,
-                                           const CallbackBasePtr& delegate,
-                                           const LocalObjectPtr& cookie) :
+ConnectionFlushBatchAsync::ConnectionFlushBatchAsync(const ConnectionIPtr& connection,
+                                                     const CommunicatorPtr& communicator,
+                                                     const InstancePtr& instance,
+                                                     const string& operation,
+                                                     const CallbackBasePtr& delegate,
+                                                     const LocalObjectPtr& cookie) :
     OutgoingAsyncBase(communicator, instance, operation, delegate, cookie), _connection(connection)
 {
     _observer.attach(instance.get(), operation);
 }
 
-ConnectionPtr 
-ConnectionFlushBatch::getConnection() const
+ConnectionPtr
+ConnectionFlushBatchAsync::getConnection() const
 {
     return _connection;
 }
 
 void
-ConnectionFlushBatch::invoke()
+ConnectionFlushBatchAsync::invoke()
 {
     try
     {
-        AsyncStatus status = _connection->flushAsyncBatchRequests(this);
+        AsyncStatus status;
+        int batchRequestNum = _connection->getBatchRequestQueue()->swap(&_os);
+        if(batchRequestNum == 0)
+        {
+            status = AsyncStatusSent;
+            if(sent())
+            {
+                status = static_cast<AsyncStatus>(status | AsyncStatusInvokeSentCallback);
+            }
+        }
+        else
+        {
+            status = _connection->sendAsyncRequest(this, false, false, batchRequestNum);
+        }
+
         if(status & AsyncStatusSent)
         {
             _sentSynchronously = true;
@@ -757,6 +755,13 @@ ConnectionFlushBatch::invoke()
             }
         }
     }
+    catch(const RetryException& ex)
+    {
+        if(completed(*ex.get()))
+        {
+            invokeCompletedAsync();
+        }
+    }
     catch(const Exception& ex)
     {
         if(completed(ex))
@@ -766,11 +771,11 @@ ConnectionFlushBatch::invoke()
     }
 }
 
-CommunicatorFlushBatch::CommunicatorFlushBatch(const CommunicatorPtr& communicator,
-                                               const InstancePtr& instance,
-                                               const string& operation,
-                                               const CallbackBasePtr& cb,
-                                               const LocalObjectPtr& cookie) :
+CommunicatorFlushBatchAsync::CommunicatorFlushBatchAsync(const CommunicatorPtr& communicator,
+                                                         const InstancePtr& instance,
+                                                         const string& operation,
+                                                         const CallbackBasePtr& cb,
+                                                         const LocalObjectPtr& cookie) :
     AsyncResult(communicator, instance, operation, cb, cookie)
 {
     _observer.attach(instance.get(), operation);
@@ -784,17 +789,17 @@ CommunicatorFlushBatch::CommunicatorFlushBatch(const CommunicatorPtr& communicat
 }
 
 void
-CommunicatorFlushBatch::flushConnection(const ConnectionIPtr& con)
+CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con)
 {
     class FlushBatch : public OutgoingAsyncBase
     {
     public:
-        
-        FlushBatch(const CommunicatorFlushBatchPtr& outAsync, 
-                   const InstancePtr& instance, 
+
+        FlushBatch(const CommunicatorFlushBatchAsyncPtr& outAsync,
+                   const InstancePtr& instance,
                    InvocationObserver& observer) :
             OutgoingAsyncBase(outAsync->getCommunicator(), instance, outAsync->getOperation(), __dummyCallback, 0),
-            _outAsync(outAsync), 
+            _outAsync(outAsync),
             _observer(observer)
         {
         }
@@ -821,7 +826,7 @@ CommunicatorFlushBatch::flushConnection(const ConnectionIPtr& con)
             return _observer;
         }
 
-        const CommunicatorFlushBatchPtr _outAsync;
+        const CommunicatorFlushBatchAsyncPtr _outAsync;
         InvocationObserver& _observer;
     };
 
@@ -832,7 +837,16 @@ CommunicatorFlushBatch::flushConnection(const ConnectionIPtr& con)
 
     try
     {
-        con->flushAsyncBatchRequests(new FlushBatch(this, _instance, _observer));
+        IceUtil::Handle<FlushBatch> flushBatch = new FlushBatch(this, _instance, _observer);
+        int batchRequestNum = con->getBatchRequestQueue()->swap(flushBatch->getOs());
+        if(batchRequestNum == 0)
+        {
+            flushBatch->sent();
+        }
+        else
+        {
+            con->sendAsyncRequest(flushBatch, false, false, batchRequestNum);
+        }
     }
     catch(const LocalException&)
     {
@@ -842,13 +856,13 @@ CommunicatorFlushBatch::flushConnection(const ConnectionIPtr& con)
 }
 
 void
-CommunicatorFlushBatch::ready()
+CommunicatorFlushBatchAsync::ready()
 {
     check(true);
 }
 
 void
-CommunicatorFlushBatch::check(bool userThread)
+CommunicatorFlushBatchAsync::check(bool userThread)
 {
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index db0a0c0826c..48e85f9dc36 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -14,7 +14,6 @@
 #include <Ice/ObjectAdapterFactory.h>
 #include <Ice/Outgoing.h>
 #include <Ice/OutgoingAsync.h>
-#include <Ice/RequestHandlerFactory.h>
 #include <Ice/Reference.h>
 #include <Ice/EndpointI.h>
 #include <Ice/Instance.h>
@@ -1359,7 +1358,7 @@ IceProxy::Ice::Object::ice_getConnection()
         }
         catch(const IceInternal::RetryException&)
         {
-            __setRequestHandler(handler, 0); // Clear request handler and retry.
+            __updateRequestHandler(handler, 0); // Clear request handler and retry.
         }
         catch(const Exception& ex)
         {
@@ -1430,7 +1429,7 @@ IceProxy::Ice::Object::ice_getCachedConnection() const
 void
 IceProxy::Ice::Object::ice_flushBatchRequests()
 {
-    FlushBatch og(this, ice_flushBatchRequests_name);
+    ProxyFlushBatch og(this, ice_flushBatchRequests_name);
     og.invoke();
 }
 
@@ -1438,7 +1437,7 @@ IceProxy::Ice::Object::ice_flushBatchRequests()
 IceProxy::Ice::Object::begin_ice_flushBatchRequestsInternal(const ::IceInternal::CallbackBasePtr& del,
                                                             const ::Ice::LocalObjectPtr& cookie)
 {
-    ProxyFlushBatchPtr result = new ProxyFlushBatch(this, ice_flushBatchRequests_name, del, cookie);
+    ProxyFlushBatchAsyncPtr result = new ProxyFlushBatchAsync(this, ice_flushBatchRequests_name, del, cookie);
     try
     {
         result->invoke();
@@ -1478,7 +1477,7 @@ IceProxy::Ice::Object::__handleException(const Exception& ex,
                                          bool sent,
                                          int& cnt)
 {
-    __setRequestHandler(handler, 0); // Clear the request handler
+    __updateRequestHandler(handler, 0); // Clear the request handler
 
     //
     // We only retry local exception, system exceptions aren't retried.
@@ -1624,19 +1623,39 @@ IceProxy::Ice::Object::__getRequestHandler()
         {
             return _requestHandler;
         }
-        handler = _reference->getInstance()->requestHandlerFactory()->getRequestHandler(_reference, this);
-        _requestHandler = handler;
     }
-    else
+    return _reference->getRequestHandler(this);
+}
+
+IceInternal::BatchRequestQueuePtr
+IceProxy::Ice::Object::__getBatchRequestQueue()
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    if(!_batchRequestQueue)
+    {
+        _batchRequestQueue = _reference->getBatchRequestQueue();
+    }
+    return _batchRequestQueue;
+}
+
+::IceInternal::RequestHandlerPtr
+IceProxy::Ice::Object::__setRequestHandler(const ::IceInternal::RequestHandlerPtr& handler)
+{
+    if(_reference->getCacheConnection())
     {
-        handler = _reference->getInstance()->requestHandlerFactory()->getRequestHandler(_reference, this);
+        IceUtil::Mutex::Lock sync(_mutex);
+        if(!_requestHandler)
+        {
+            _requestHandler = handler;
+        }
+        return _requestHandler;
     }
-    return handler->connect(this);
+    return handler;
 }
 
 void
-IceProxy::Ice::Object::__setRequestHandler(const ::IceInternal::RequestHandlerPtr& previous,
-                                           const ::IceInternal::RequestHandlerPtr& handler)
+IceProxy::Ice::Object::__updateRequestHandler(const ::IceInternal::RequestHandlerPtr& previous,
+                                              const ::IceInternal::RequestHandlerPtr& handler)
 {
     if(_reference->getCacheConnection() && previous)
     {
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 63abb0d5e13..5bbfd7e27f6 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -24,6 +24,8 @@
 #include <Ice/LoggerUtil.h>
 #include <Ice/TraceLevels.h>
 #include <Ice/HashUtil.h>
+#include <Ice/RequestHandlerFactory.h>
+#include <Ice/ConnectionRequestHandler.h>
 #include <Ice/DefaultsAndOverrides.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/Random.h>
@@ -143,7 +145,7 @@ IceInternal::Reference::changeInvocationTimeout(int invocationTimeout) const
     r->_invocationTimeout = invocationTimeout;
     return r;
 }
- 
+
 ReferencePtr
 IceInternal::Reference::changeEncoding(const Ice::EncodingVersion& encoding) const
 {
@@ -155,7 +157,7 @@ IceInternal::Reference::changeEncoding(const Ice::EncodingVersion& encoding) con
     r->_encoding = encoding;
     return r;
 }
- 
+
 ReferencePtr
 IceInternal::Reference::changeCompress(bool newCompress) const
 {
@@ -315,7 +317,7 @@ IceInternal::Reference::toString() const
     // Always print the encoding version to ensure a stringified proxy
     // will convert back to a proxy with the same encoding with
     // stringToProxy (and won't use Ice.Default.EncodingVersion).
-    // 
+    //
     s << " -e " << _encoding;
 
     return s.str();
@@ -365,7 +367,7 @@ IceInternal::Reference::operator==(const Reference& r) const
         return false;
     }
 
-    if(_encoding != r._encoding) 
+    if(_encoding != r._encoding)
     {
         return false;
     }
@@ -460,25 +462,25 @@ IceInternal::Reference::operator<(const Reference& r) const
     {
         return true;
     }
-    else if(r._protocol < _protocol) 
+    else if(r._protocol < _protocol)
     {
         return false;
     }
 
-    if(_encoding < r._encoding) 
+    if(_encoding < r._encoding)
     {
         return true;
     }
-    else if(r._encoding < _encoding) 
+    else if(r._encoding < _encoding)
     {
         return false;
     }
 
-    if(_invocationTimeout < r._invocationTimeout) 
+    if(_invocationTimeout < r._invocationTimeout)
     {
         return true;
     }
-    else if(r._invocationTimeout < _invocationTimeout) 
+    else if(r._invocationTimeout < _invocationTimeout)
     {
         return false;
     }
@@ -508,10 +510,10 @@ public:
     }
 };
 
-IceInternal::Reference::Reference(const InstancePtr& instance, 
-                                  const CommunicatorPtr& communicator, 
+IceInternal::Reference::Reference(const InstancePtr& instance,
+                                  const CommunicatorPtr& communicator,
                                   const Identity& id,
-                                  const string& facet, 
+                                  const string& facet,
                                   Mode mode,
                                   bool secure,
                                   const ProtocolVersion& protocol,
@@ -576,10 +578,10 @@ IceInternal::Reference::hashInit() const
 
 IceUtil::Shared* IceInternal::upCast(IceInternal::FixedReference* p) { return p; }
 
-IceInternal::FixedReference::FixedReference(const InstancePtr& instance, 
-                                            const CommunicatorPtr& communicator, 
+IceInternal::FixedReference::FixedReference(const InstancePtr& instance,
+                                            const CommunicatorPtr& communicator,
                                             const Identity& id,
-                                            const string& facet, 
+                                            const string& facet,
                                             Mode mode,
                                             bool secure,
                                             const EncodingVersion& encoding,
@@ -750,75 +752,76 @@ IceInternal::FixedReference::toProperty(const string&) const
     return PropertyDict(); // To keep the compiler from complaining.
 }
 
-void
-IceInternal::FixedReference::getConnection(const GetConnectionCallbackPtr& callback) const
+RequestHandlerPtr
+IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrx& proxy) const
 {
-    try
+    switch(getMode())
     {
-        switch(getMode())
-        {
-        case Reference::ModeTwoway:
-        case Reference::ModeOneway:
-        case Reference::ModeBatchOneway:
-        {
-            if(_fixedConnection->endpoint()->datagram())
-            {
-                throw NoEndpointException(__FILE__, __LINE__, "");
-            }
-            break;
-        }
-
-        case Reference::ModeDatagram:
-        case Reference::ModeBatchDatagram:
+    case Reference::ModeTwoway:
+    case Reference::ModeOneway:
+    case Reference::ModeBatchOneway:
+    {
+        if(_fixedConnection->endpoint()->datagram())
         {
-            if(!_fixedConnection->endpoint()->datagram())
-            {
-                throw NoEndpointException(__FILE__, __LINE__, "");
-            }
-            break;
-        }
+            throw NoEndpointException(__FILE__, __LINE__, "");
         }
+        break;
+    }
 
-        //
-        // If a secure connection is requested or secure overrides is set,
-        // check if the connection is secure.
-        //
-        bool secure;
-        DefaultsAndOverridesPtr defaultsAndOverrides = getInstance()->defaultsAndOverrides();
-        if(defaultsAndOverrides->overrideSecure)
-        {
-            secure = defaultsAndOverrides->overrideSecureValue;
-        }
-        else
-        {
-            secure = getSecure();
-        }
-        if(secure && !_fixedConnection->endpoint()->secure())
+    case Reference::ModeDatagram:
+    case Reference::ModeBatchDatagram:
+    {
+        if(!_fixedConnection->endpoint()->datagram())
         {
             throw NoEndpointException(__FILE__, __LINE__, "");
         }
+        break;
+    }
+    }
 
-        _fixedConnection->throwException(); // Throw in case our connection is already destroyed.
-        
-        bool compress;
-        if(defaultsAndOverrides->overrideCompress)
-        {
-            compress = defaultsAndOverrides->overrideCompressValue;
-        }
-        else if(_overrideCompress)
-        {
-            compress = _compress;
-        }
-        else
-        {
-            compress = _fixedConnection->endpoint()->compress();
-        }
-        callback->setConnection(_fixedConnection, compress);
+    //
+    // If a secure connection is requested or secure overrides is set,
+    // check if the connection is secure.
+    //
+    bool secure;
+    DefaultsAndOverridesPtr defaultsAndOverrides = getInstance()->defaultsAndOverrides();
+    if(defaultsAndOverrides->overrideSecure)
+    {
+        secure = defaultsAndOverrides->overrideSecureValue;
+    }
+    else
+    {
+        secure = getSecure();
+    }
+    if(secure && !_fixedConnection->endpoint()->secure())
+    {
+        throw NoEndpointException(__FILE__, __LINE__, "");
+    }
+
+    _fixedConnection->throwException(); // Throw in case our connection is already destroyed.
+
+    bool compress;
+    if(defaultsAndOverrides->overrideCompress)
+    {
+        compress = defaultsAndOverrides->overrideCompressValue;
+    }
+    else if(_overrideCompress)
+    {
+        compress = _compress;
     }
-    catch(const Ice::LocalException& ex)
+    else
     {
-        callback->setException(ex);
+        compress = _fixedConnection->endpoint()->compress();
     }
+
+    ReferencePtr ref = const_cast<FixedReference*>(this);
+    return proxy->__setRequestHandler(new ConnectionRequestHandler(ref, _fixedConnection, compress));
+}
+
+BatchRequestQueuePtr
+IceInternal::FixedReference::getBatchRequestQueue() const
+{
+    return _fixedConnection->getBatchRequestQueue();
 }
 
 bool
@@ -857,7 +860,7 @@ IceInternal::FixedReference::operator<(const Reference& r) const
     {
         return false;
     }
-    
+
     const FixedReference* rhs = dynamic_cast<const FixedReference*>(&r);
     if(!rhs)
     {
@@ -881,12 +884,12 @@ IceInternal::FixedReference::FixedReference(const FixedReference& r) :
 
 IceUtil::Shared* IceInternal::upCast(IceInternal::RoutableReference* p) { return p; }
 
-IceInternal::RoutableReference::RoutableReference(const InstancePtr& instance, 
+IceInternal::RoutableReference::RoutableReference(const InstancePtr& instance,
                                                   const CommunicatorPtr& communicator,
-                                                  const Identity& id, 
+                                                  const Identity& id,
                                                   const string& facet,
-                                                  Mode mode, 
-                                                  bool secure, 
+                                                  Mode mode,
+                                                  bool secure,
                                                   const ProtocolVersion& protocol,
                                                   const EncodingVersion& encoding,
                                                   const vector<EndpointIPtr>& endpoints,
@@ -895,7 +898,7 @@ IceInternal::RoutableReference::RoutableReference(const InstancePtr& instance,
                                                   const RouterInfoPtr& routerInfo,
                                                   bool collocationOptimized,
                                                   bool cacheConnection,
-                                                  bool preferSecure, 
+                                                  bool preferSecure,
                                                   EndpointSelectionType endpointSelection,
                                                   int locatorCacheTimeout,
                                                   int invocationTimeout,
@@ -1501,6 +1504,18 @@ IceInternal::RoutableReference::clone() const
     return new RoutableReference(*this);
 }
 
+RequestHandlerPtr
+IceInternal::RoutableReference::getRequestHandler(const Ice::ObjectPrx& proxy) const
+{
+    return getInstance()->requestHandlerFactory()->getRequestHandler(const_cast<RoutableReference*>(this), proxy);
+}
+
+BatchRequestQueuePtr
+IceInternal::RoutableReference::getBatchRequestQueue() const
+{
+    return new BatchRequestQueue(getInstance(), getMode() == Reference::ModeBatchDatagram);
+}
+
 void
 IceInternal::RoutableReference::getConnection(const GetConnectionCallbackPtr& callback) const
 {
@@ -1650,7 +1665,7 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal
         createConnection(_endpoints, callback);
         return;
     }
-    
+
     if(_locatorInfo)
     {
         RoutableReference* self = const_cast<RoutableReference*>(this);
@@ -1685,7 +1700,7 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all
 
             virtual void
             setConnection(const Ice::ConnectionIPtr& connection, bool compress)
-            { 
+            {
                 //
                 // If we have a router, set the object adapter for this router
                 // (if any) to the new connection, so that callbacks from the
@@ -1703,7 +1718,7 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all
             {
                 _callback->setException(ex);
             }
-            
+
             CB1(const RouterInfoPtr& routerInfo, const GetConnectionCallbackPtr& callback) :
                 _routerInfo(routerInfo), _callback(callback)
             {
@@ -1750,21 +1765,21 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all
                 {
                     _exception.reset(ex.ice_clone());
                 }
-                
+
                 if(++_i == _endpoints.size())
                 {
                     _callback->setException(*_exception.get());
                     return;
                 }
-                
+
                 const bool more = _i != _endpoints.size() - 1;
                 vector<EndpointIPtr> endpoint;
                 endpoint.push_back(_endpoints[_i]);
-                
+
                 OutgoingConnectionFactoryPtr factory = _reference->getInstance()->outgoingConnectionFactory();
                 factory->create(endpoint, more, _reference->getEndpointSelection(), this);
             }
-            
+
             CB2(const RoutableReferencePtr& reference, const vector<EndpointIPtr>& endpoints,
                 const GetConnectionCallbackPtr& callback) :
                 _reference(reference),
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index d2de0c7ac2d..a8d1b773c46 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -20,6 +20,8 @@
 #include <Ice/RouterInfoF.h>
 #include <Ice/LocatorInfoF.h>
 #include <Ice/ConnectionIF.h>
+#include <Ice/RequestHandlerF.h>
+#include <Ice/BatchRequestQueue.h>
 #include <Ice/SharedContext.h>
 #include <Ice/Identity.h>
 #include <Ice/Protocol.h>
@@ -37,7 +39,7 @@ public:
     class GetConnectionCallback : virtual public IceUtil::Shared
     {
     public:
-        
+
         virtual void setConnection(const Ice::ConnectionIPtr&, bool) = 0;
         virtual void setException(const Ice::LocalException&) = 0;
     };
@@ -103,7 +105,7 @@ public:
 
     virtual ReferencePtr changeTimeout(int) const = 0;
     virtual ReferencePtr changeConnectionId(const std::string&) const = 0;
-    
+
     int hash() const; // Conceptually const.
 
     //
@@ -130,7 +132,8 @@ public:
     //
     // Get a suitable connection for this reference.
     //
-    virtual void getConnection(const GetConnectionCallbackPtr&) const = 0;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const = 0;
+    virtual BatchRequestQueuePtr getBatchRequestQueue() const = 0;
 
     virtual bool operator==(const Reference&) const;
     virtual bool operator!=(const Reference&) const;
@@ -205,7 +208,8 @@ public:
     virtual std::string toString() const;
     virtual Ice::PropertyDict toProperty(const std::string&) const;
 
-    virtual void getConnection(const GetConnectionCallbackPtr&) const;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const;
+    virtual BatchRequestQueuePtr getBatchRequestQueue() const;
 
     virtual bool operator==(const Reference&) const;
     virtual bool operator!=(const Reference&) const;
@@ -226,7 +230,7 @@ public:
 
     RoutableReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const std::string&, Mode,
                       bool, const Ice::ProtocolVersion&, const Ice::EncodingVersion&, const std::vector<EndpointIPtr>&,
-                      const std::string&, const LocatorInfoPtr&, const RouterInfoPtr&, bool, bool, bool, 
+                      const std::string&, const LocatorInfoPtr&, const RouterInfoPtr&, bool, bool, bool,
                       Ice::EndpointSelectionType, int, int, const Ice::Context&);
 
     virtual std::vector<EndpointIPtr> getEndpoints() const;
@@ -268,8 +272,11 @@ public:
 
     virtual ReferencePtr clone() const;
 
-    virtual void getConnection(const GetConnectionCallbackPtr&) const;
-    virtual void getConnectionNoRouterInfo(const GetConnectionCallbackPtr&) const;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const;
+    virtual BatchRequestQueuePtr getBatchRequestQueue() const;
+
+    void getConnection(const GetConnectionCallbackPtr&) const;
+    void getConnectionNoRouterInfo(const GetConnectionCallbackPtr&) const;
 
     void createConnection(const std::vector<EndpointIPtr>&, const GetConnectionCallbackPtr&) const;
     void applyOverrides(std::vector<EndpointIPtr>&) const;
@@ -283,7 +290,7 @@ protected:
     virtual int hashInit() const;
 
 private:
-    
+
     std::vector<EndpointIPtr> _endpoints; // Empty if indirect proxy.
     std::string _adapterId; // Empty if direct proxy.
 
diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h
index 7900c055a03..03a55f7773d 100644
--- a/cpp/src/Ice/RequestHandler.h
+++ b/cpp/src/Ice/RequestHandler.h
@@ -32,6 +32,7 @@ namespace IceInternal
 class BasicStream;
 
 class OutgoingBase;
+class ProxyOutgoingBase;
 
 //
 // An exception wrapper, which is used to notify that the request
@@ -63,15 +64,10 @@ class RequestHandler : public CancellationHandler
 {
 public:
 
-    virtual RequestHandlerPtr connect(const Ice::ObjectPrx&) = 0;
     virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&) = 0;
 
-    virtual void prepareBatchRequest(BasicStream*) = 0;
-    virtual void finishBatchRequest(BasicStream*) = 0;
-    virtual void abortBatchRequest() = 0;
-
-    virtual bool sendRequest(OutgoingBase*) = 0;
-    virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncBasePtr&) = 0;
+    virtual bool sendRequest(ProxyOutgoingBase*) = 0;
+    virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&) = 0;
 
     const ReferencePtr& getReference() const { return _reference; } // Inlined for performances.
 
diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp
index 0ca1ce15115..0b2d0ff10ed 100644
--- a/cpp/src/Ice/RequestHandlerFactory.cpp
+++ b/cpp/src/Ice/RequestHandlerFactory.cpp
@@ -22,49 +22,57 @@ RequestHandlerFactory::RequestHandlerFactory(const InstancePtr& instance) : _ins
 {
 }
 
-RequestHandlerPtr 
-IceInternal::RequestHandlerFactory::getRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrx& proxy)
+RequestHandlerPtr
+IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr& ref, const Ice::ObjectPrx& proxy)
 {
     if(ref->getCollocationOptimized())
     {
         Ice::ObjectAdapterPtr adapter = _instance->objectAdapterFactory()->findObjectAdapter(proxy);
         if(adapter)
         {
-            return new CollocatedRequestHandler(ref, adapter);
+            return proxy->__setRequestHandler(new CollocatedRequestHandler(ref, adapter));
         }
     }
 
+    ConnectRequestHandlerPtr handler;
+    bool connect = false;
     if(ref->getCacheConnection())
     {
         Lock sync(*this);
-        
-        map<ReferencePtr, RequestHandlerPtr>::iterator p = _handlers.find(ref);
-        if(p != _handlers.end())
+        map<ReferencePtr, ConnectRequestHandlerPtr>::iterator p = _handlers.find(ref);
+        if(p == _handlers.end())
         {
-            return p->second;
+            handler = new ConnectRequestHandler(ref, proxy);
+            _handlers.insert(make_pair(ref, handler));
+            connect = true;
+        }
+        else
+        {
+            handler = p->second;
         }
-        
-        RequestHandlerPtr handler = new ConnectRequestHandler(ref, proxy);
-        _handlers.insert(make_pair(ref, handler));
-        return handler;
     }
     else
     {
-        return new ConnectRequestHandler(ref, proxy);
+        handler = new ConnectRequestHandler(ref, proxy);
+        connect = true;
     }
+    if(connect)
+    {
+        ref->getConnection(handler.get());
+    }
+    return proxy->__setRequestHandler(handler->connect(proxy));
 }
 
-void 
+void
 IceInternal::RequestHandlerFactory::removeRequestHandler(const ReferencePtr& ref, const RequestHandlerPtr& handler)
 {
     if(ref->getCacheConnection())
     {
         Lock sync(*this);
-        map<ReferencePtr, RequestHandlerPtr>::iterator p = _handlers.find(ref);
+        map<ReferencePtr, ConnectRequestHandlerPtr>::iterator p = _handlers.find(ref);
         if(p != _handlers.end() && p->second.get() == handler.get())
         {
             _handlers.erase(p);
         }
     }
 }
-
diff --git a/cpp/src/Ice/RequestHandlerFactory.h b/cpp/src/Ice/RequestHandlerFactory.h
index b71e73455b6..6a9aec0114d 100644
--- a/cpp/src/Ice/RequestHandlerFactory.h
+++ b/cpp/src/Ice/RequestHandlerFactory.h
@@ -14,6 +14,7 @@
 #include <IceUtil/Mutex.h>
 
 #include <Ice/RequestHandlerF.h>
+#include <Ice/ConnectRequestHandlerF.h>
 #include <Ice/ProxyF.h>
 #include <Ice/ReferenceF.h>
 #include <Ice/InstanceF.h>
@@ -26,14 +27,14 @@ class RequestHandlerFactory : public IceUtil::Shared, private IceUtil::Mutex
 public:
 
     RequestHandlerFactory(const InstancePtr&);
-    
-    RequestHandlerPtr getRequestHandler(const ReferencePtr&, const Ice::ObjectPrx&);
+
+    RequestHandlerPtr getRequestHandler(const RoutableReferencePtr&, const Ice::ObjectPrx&);
     void removeRequestHandler(const ReferencePtr&, const RequestHandlerPtr&);
 
 private:
 
     const InstancePtr _instance;
-    std::map<ReferencePtr, RequestHandlerPtr> _handlers;
+    std::map<ReferencePtr, ConnectRequestHandlerPtr> _handlers;
 };
 
 }
diff --git a/cpp/src/Ice/winrt/Makefile.mak b/cpp/src/Ice/winrt/Makefile.mak
index 2a8a242b0bf..0eb005f1ebe 100644
--- a/cpp/src/Ice/winrt/Makefile.mak
+++ b/cpp/src/Ice/winrt/Makefile.mak
@@ -18,6 +18,7 @@ OBJS		= $(ARCH)\$(CONFIG)\Acceptor.obj \
 		  $(ARCH)\$(CONFIG)\Base64.obj \
 		  $(ARCH)\$(CONFIG)\Buffer.obj \
 		  $(ARCH)\$(CONFIG)\BasicStream.obj \
+		  $(ARCH)\$(CONFIG)\BatchRequestQueue.obj \
 		  $(ARCH)\$(CONFIG)\BuiltinSequences.obj \
 		  $(ARCH)\$(CONFIG)\CommunicatorI.obj \
 		  $(ARCH)\$(CONFIG)\Communicator.obj \
diff --git a/cpp/src/IceBox/.depend.mak b/cpp/src/IceBox/.depend.mak
index 3ed1ab2f67c..4557da6387c 100755
--- a/cpp/src/IceBox/.depend.mak
+++ b/cpp/src/IceBox/.depend.mak
@@ -58,6 +58,7 @@ Service.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -80,6 +81,7 @@ Service.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -183,6 +185,7 @@ ServiceManagerI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -205,6 +208,7 @@ ServiceManagerI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -325,6 +329,7 @@ Admin.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -347,6 +352,7 @@ Admin.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -435,6 +441,7 @@ IceBox.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -518,6 +525,7 @@ Exception.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
diff --git a/cpp/src/IceDiscovery/.depend.mak b/cpp/src/IceDiscovery/.depend.mak
index fa677259f17..8b10504c3bd 100755
--- a/cpp/src/IceDiscovery/.depend.mak
+++ b/cpp/src/IceDiscovery/.depend.mak
@@ -42,6 +42,7 @@ LocatorI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -134,6 +135,7 @@ LookupI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -185,6 +187,7 @@ LookupI.obj: \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "LookupI.h" \
     "IceDiscovery.h" \
     "LocatorI.h" \
@@ -254,6 +257,7 @@ PluginI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\InstanceF.h" \
@@ -275,6 +279,7 @@ PluginI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -360,6 +365,7 @@ IceDiscovery.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak
index 23a52167f57..7593c7e4e53 100755
--- a/cpp/src/IceGrid/.depend.mak
+++ b/cpp/src/IceGrid/.depend.mak
@@ -80,6 +80,7 @@ Client.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -102,6 +103,7 @@ Client.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -203,6 +205,7 @@ DescriptorBuilder.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -315,6 +318,7 @@ DescriptorHelper.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -337,6 +341,7 @@ DescriptorHelper.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -450,6 +455,7 @@ DescriptorParser.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -472,6 +478,7 @@ DescriptorParser.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -573,6 +580,7 @@ FileParserI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -687,6 +695,7 @@ Parser.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\InstanceF.h" \
@@ -708,6 +717,7 @@ Parser.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -824,6 +834,7 @@ Util.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -846,6 +857,7 @@ Util.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -944,6 +956,7 @@ Internal.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1041,6 +1054,7 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1137,6 +1151,7 @@ Grammar.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1159,6 +1174,7 @@ Grammar.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1265,6 +1281,7 @@ Scanner.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1287,6 +1304,7 @@ Scanner.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1394,6 +1412,7 @@ AdminRouter.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1416,6 +1435,7 @@ AdminRouter.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1499,6 +1519,7 @@ FileCache.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1588,6 +1609,7 @@ PlatformInfo.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1704,6 +1726,7 @@ SessionManager.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1726,6 +1749,7 @@ SessionManager.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1823,6 +1847,7 @@ TraceLevels.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1919,6 +1944,7 @@ Activator.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1941,6 +1967,7 @@ Activator.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -2052,6 +2079,7 @@ NodeAdminRouter.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
@@ -2115,6 +2143,7 @@ NodeAdminRouter.obj: \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Logger.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
@@ -2201,6 +2230,7 @@ NodeI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -2223,6 +2253,7 @@ NodeI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -2350,6 +2381,7 @@ NodeSessionManager.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -2372,6 +2404,7 @@ NodeSessionManager.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -2490,6 +2523,7 @@ ServerAdapterI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -2512,6 +2546,7 @@ ServerAdapterI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -2633,6 +2668,7 @@ ServerI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -2655,6 +2691,7 @@ ServerI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -2770,6 +2807,7 @@ AdapterCache.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -2856,6 +2894,7 @@ AdapterCache.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\RemoteLogger.h" \
     "$(includedir)\Ice\CommunicatorAsync.h" \
     "$(includedir)\Ice\ObjectAdapter.h" \
@@ -2933,6 +2972,7 @@ AdminCallbackRouter.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -2955,6 +2995,7 @@ AdminCallbackRouter.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -3058,6 +3099,7 @@ AdminI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -3080,6 +3122,7 @@ AdminI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -3256,6 +3299,7 @@ AdminSessionI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -3278,6 +3322,7 @@ AdminSessionI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -3443,6 +3488,7 @@ Allocatable.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
@@ -3498,6 +3544,7 @@ Allocatable.obj: \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\RemoteLogger.h" \
@@ -3574,6 +3621,7 @@ AllocatableObjectCache.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -3650,6 +3698,7 @@ AllocatableObjectCache.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\RemoteLogger.h" \
     "$(includedir)\Ice\CommunicatorAsync.h" \
     "$(includedir)\Ice\ObjectAdapter.h" \
@@ -3726,6 +3775,7 @@ Database.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -3776,6 +3826,7 @@ Database.obj: \
     "$(includedir)\IceUtil\Thread.h" \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\RemoteLogger.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
@@ -3899,6 +3950,7 @@ FileUserAccountMapperI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -4002,6 +4054,7 @@ IdentityObjectInfoDict.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -4009,6 +4062,7 @@ IdentityObjectInfoDict.obj: \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -4117,6 +4171,7 @@ InternalRegistryI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -4139,6 +4194,7 @@ InternalRegistryI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -4307,6 +4363,7 @@ LocatorI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -4329,6 +4386,7 @@ LocatorI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -4489,6 +4547,7 @@ LocatorRegistryI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -4511,6 +4570,7 @@ LocatorRegistryI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -4650,6 +4710,7 @@ NodeCache.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -4732,6 +4793,7 @@ NodeCache.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\RemoteLogger.h" \
     "$(includedir)\Ice\CommunicatorAsync.h" \
     "$(includedir)\Ice\ObjectAdapter.h" \
@@ -4819,6 +4881,7 @@ NodeSessionI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -4841,6 +4904,7 @@ NodeSessionI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -4978,6 +5042,7 @@ ObjectCache.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -5062,6 +5127,7 @@ ObjectCache.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\RemoteLogger.h" \
     "$(includedir)\Ice\CommunicatorAsync.h" \
     "$(includedir)\Ice\ObjectAdapter.h" \
@@ -5128,6 +5194,7 @@ PluginFacadeI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -5194,6 +5261,7 @@ PluginFacadeI.obj: \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Logger.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
@@ -5298,6 +5366,7 @@ QueryI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -5363,6 +5432,7 @@ QueryI.obj: \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Logger.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
@@ -5480,6 +5550,7 @@ ReapThread.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -5502,6 +5573,7 @@ ReapThread.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -5602,6 +5674,7 @@ RegistryAdminRouter.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -5624,6 +5697,7 @@ RegistryAdminRouter.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -5772,6 +5846,7 @@ RegistryI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -5794,6 +5869,7 @@ RegistryI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -5975,6 +6051,7 @@ ReplicaCache.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -6100,6 +6177,7 @@ ReplicaSessionI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -6122,6 +6200,7 @@ ReplicaSessionI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -6273,6 +6352,7 @@ ReplicaSessionManager.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -6295,6 +6375,7 @@ ReplicaSessionManager.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -6464,6 +6545,7 @@ SerialsDict.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -6471,6 +6553,7 @@ SerialsDict.obj: \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -6565,6 +6648,7 @@ ServerCache.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -6647,6 +6731,7 @@ ServerCache.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\RemoteLogger.h" \
     "$(includedir)\Ice\CommunicatorAsync.h" \
     "$(includedir)\Ice\ObjectAdapter.h" \
@@ -6726,6 +6811,7 @@ SessionI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -6748,6 +6834,7 @@ SessionI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -6904,6 +6991,7 @@ SessionServantManager.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -6942,6 +7030,7 @@ SessionServantManager.obj: \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
@@ -7058,6 +7147,7 @@ StringAdapterInfoDict.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -7065,6 +7155,7 @@ StringAdapterInfoDict.obj: \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -7190,6 +7281,7 @@ StringApplicationInfoDict.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -7197,6 +7289,7 @@ StringApplicationInfoDict.obj: \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -7304,6 +7397,7 @@ Topics.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -7326,6 +7420,7 @@ Topics.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -7428,6 +7523,7 @@ WellKnownObjectsManager.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -7494,6 +7590,7 @@ WellKnownObjectsManager.obj: \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Logger.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
@@ -7615,6 +7712,7 @@ IceGridNode.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -7637,6 +7735,7 @@ IceGridNode.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -7776,6 +7875,7 @@ IceGridRegistry.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -7798,6 +7898,7 @@ IceGridRegistry.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
diff --git a/cpp/src/IceGridLib/.depend.mak b/cpp/src/IceGridLib/.depend.mak
index e9afd2e4634..8c45d59ffd5 100755
--- a/cpp/src/IceGridLib/.depend.mak
+++ b/cpp/src/IceGridLib/.depend.mak
@@ -140,6 +140,7 @@ PluginFacadeI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -233,6 +234,7 @@ Admin.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -324,6 +326,7 @@ Descriptor.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -462,6 +465,7 @@ FileParser.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -554,6 +558,7 @@ Locator.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -639,6 +644,7 @@ Observer.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -731,6 +737,7 @@ PluginFacade.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -823,6 +830,7 @@ Query.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -906,6 +914,7 @@ Registry.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -999,6 +1008,7 @@ Session.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1087,6 +1097,7 @@ UserAccountMapper.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
diff --git a/cpp/src/IceLocatorDiscovery/.depend.mak b/cpp/src/IceLocatorDiscovery/.depend.mak
index ae7b8155e87..895bb7af000 100755
--- a/cpp/src/IceLocatorDiscovery/.depend.mak
+++ b/cpp/src/IceLocatorDiscovery/.depend.mak
@@ -65,6 +65,7 @@ PluginI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\InstanceF.h" \
@@ -86,6 +87,7 @@ PluginI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -169,6 +171,7 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
diff --git a/cpp/src/IcePatch2/.depend.mak b/cpp/src/IcePatch2/.depend.mak
index 7b932fe9474..427a64f2942 100755
--- a/cpp/src/IcePatch2/.depend.mak
+++ b/cpp/src/IcePatch2/.depend.mak
@@ -54,6 +54,7 @@ FileServerI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -76,6 +77,7 @@ FileServerI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -180,6 +182,7 @@ Server.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -202,6 +205,7 @@ Server.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -305,6 +309,7 @@ Client.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -327,6 +332,7 @@ Client.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -431,6 +437,7 @@ Calc.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -453,6 +460,7 @@ Calc.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak
index 75812348d16..790dbe71f1a 100755
--- a/cpp/src/IcePatch2Lib/.depend.mak
+++ b/cpp/src/IcePatch2Lib/.depend.mak
@@ -61,6 +61,7 @@ ClientUtil.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -83,6 +84,7 @@ ClientUtil.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -197,6 +199,7 @@ Util.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\InstanceF.h" \
@@ -218,6 +221,7 @@ Util.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -352,6 +356,7 @@ FileServer.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
diff --git a/cpp/src/IceSSL/.depend.mak b/cpp/src/IceSSL/.depend.mak
index 2852f15e97c..df64d3b2d8e 100755
--- a/cpp/src/IceSSL/.depend.mak
+++ b/cpp/src/IceSSL/.depend.mak
@@ -54,6 +54,7 @@ ConnectionInfo.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -183,6 +184,7 @@ AcceptorI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -245,6 +247,7 @@ AcceptorI.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "..\..\src\Ice\ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -323,6 +326,7 @@ Certificate.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -397,6 +401,7 @@ ConnectorI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -453,6 +458,7 @@ ConnectorI.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "..\..\src\Ice\ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -547,6 +553,7 @@ EndpointI.obj: \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
@@ -602,6 +609,7 @@ EndpointI.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "..\..\src\Ice\ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -663,6 +671,7 @@ Instance.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -717,6 +726,7 @@ Instance.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "..\..\src\Ice\ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -784,6 +794,7 @@ PluginI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -842,6 +853,7 @@ PluginI.obj: \
     "..\..\src\Ice\NetworkProxyF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "..\..\src\Ice\ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -912,6 +924,7 @@ RFC2253.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -984,6 +997,7 @@ SChannelEngine.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1085,6 +1099,7 @@ SChannelTransceiverI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1147,6 +1162,7 @@ SChannelTransceiverI.obj: \
     "$(includedir)\Ice\PluginF.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "..\..\src\Ice\ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -1215,6 +1231,7 @@ SSLEngine.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1318,6 +1335,7 @@ TrustManager.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1413,6 +1431,7 @@ Util.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
diff --git a/cpp/src/IceStorm/.depend.mak b/cpp/src/IceStorm/.depend.mak
index 01b2097ccdc..cf9512a82e7 100755
--- a/cpp/src/IceStorm/.depend.mak
+++ b/cpp/src/IceStorm/.depend.mak
@@ -146,6 +146,7 @@ Instance.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -199,6 +200,7 @@ Instance.obj: \
     "$(includedir)\IceUtil\Thread.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -297,6 +299,7 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\RequestHandlerF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -339,6 +342,7 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
     "$(includedir)\Ice\Plugin.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\MetricsFunctional.h" \
     "Instrumentation.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
@@ -423,6 +427,7 @@ LLUMap.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -430,6 +435,7 @@ LLUMap.obj: \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -541,6 +547,7 @@ NodeI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\InstanceF.h" \
@@ -562,6 +569,7 @@ NodeI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -668,6 +676,7 @@ Observers.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -690,6 +699,7 @@ Observers.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -800,6 +810,7 @@ Service.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -850,6 +861,7 @@ Service.obj: \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -945,6 +957,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1009,6 +1022,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -1129,6 +1143,7 @@ SubscriberMap.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -1136,6 +1151,7 @@ SubscriberMap.obj: \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1243,6 +1259,7 @@ TopicI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1265,6 +1282,7 @@ TopicI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1403,6 +1421,7 @@ TopicManagerI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1425,6 +1444,7 @@ TopicManagerI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -1551,6 +1571,7 @@ TraceLevels.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1627,6 +1648,7 @@ TransientTopicI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1685,6 +1707,7 @@ TransientTopicI.obj: \
     "$(includedir)\IceUtil\Thread.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -1776,6 +1799,7 @@ TransientTopicManagerI.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -1834,6 +1858,7 @@ TransientTopicManagerI.obj: \
     "$(includedir)\IceUtil\Thread.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -1921,6 +1946,7 @@ Util.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -1943,6 +1969,7 @@ Util.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -2074,6 +2101,7 @@ V31FormatDB.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -2081,6 +2109,7 @@ V31FormatDB.obj: \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -2208,6 +2237,7 @@ V32FormatDB.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\AsyncResultF.h" \
@@ -2215,6 +2245,7 @@ V32FormatDB.obj: \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -2312,6 +2343,7 @@ Election.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -2398,6 +2430,7 @@ IceStormInternal.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -2485,6 +2518,7 @@ Instrumentation.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -2569,6 +2603,7 @@ LinkRecord.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -2705,6 +2740,7 @@ SubscriberRecord.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -2789,6 +2825,7 @@ V31Format.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -2878,6 +2915,7 @@ V32Format.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -2983,6 +3021,7 @@ Admin.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -3005,6 +3044,7 @@ Admin.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -3106,6 +3146,7 @@ Parser.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -3128,6 +3169,7 @@ Parser.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -3232,6 +3274,7 @@ Grammar.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -3254,6 +3297,7 @@ Grammar.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -3355,6 +3399,7 @@ Scanner.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -3377,6 +3422,7 @@ Scanner.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -3481,6 +3527,7 @@ Migrate.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -3503,6 +3550,7 @@ Migrate.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
diff --git a/cpp/src/IceStormLib/.depend.mak b/cpp/src/IceStormLib/.depend.mak
index c1fa8542c61..90076091925 100755
--- a/cpp/src/IceStormLib/.depend.mak
+++ b/cpp/src/IceStormLib/.depend.mak
@@ -50,6 +50,7 @@ IceStorm.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
@@ -134,6 +135,7 @@ Metrics.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
diff --git a/cpp/src/iceserviceinstall/.depend.mak b/cpp/src/iceserviceinstall/.depend.mak
index a4d538923d7..fd954d1c20e 100755
--- a/cpp/src/iceserviceinstall/.depend.mak
+++ b/cpp/src/iceserviceinstall/.depend.mak
@@ -50,6 +50,7 @@ ServiceInstaller.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -72,6 +73,7 @@ ServiceInstaller.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
@@ -176,6 +178,7 @@ Install.obj: \
     "$(includedir)\Ice\EndpointTypes.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ReferenceF.h" \
+    "$(includedir)\Ice\BatchRequestQueueF.h" \
     "$(includedir)\Ice\AsyncResult.h" \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\Ice\ConnectionF.h" \
@@ -198,6 +201,7 @@ Install.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
     "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\BatchRequestInterceptor.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
author	Benoit Foucher <benoit@zeroc.com>	2015-03-10 12:12:10 +0100
committer	Benoit Foucher <benoit@zeroc.com>	2015-03-10 12:12:10 +0100
commit	c6ca68d97aa5bbc2a172e3e35171b5452657fa22 (patch)
tree	46edcca4c8e313285a205bf6fad7c56c452c0cc0 /cpp/src
parent	Minor JS style fixes (diff)
download	ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.tar.bz2 ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.tar.xz ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.zip