ICE-6170 - fixed behavior of batch requests

2 files changed, 252 insertions, 219 deletions

diff --git a/py/python/.depend.mak b/py/python/.depend.mak
index e41cdc88afa..e46e1645583 100644
--- a/py/python/.depend.mak
+++ b/py/python/.depend.mak
@@ -1,331 +1,331 @@
 
 Ice_BuiltinSequences_ice.py: \
-    $(slicedir)\Ice\BuiltinSequences.ice
+    "$(slicedir)\Ice\BuiltinSequences.ice"
 
 Ice_Communicator_ice.py: \
-    $(slicedir)\Ice\Communicator.ice \
-    $(slicedir)/Ice/LoggerF.ice \
-    $(slicedir)/Ice/InstrumentationF.ice \
-    $(slicedir)/Ice/ObjectAdapterF.ice \
-    $(slicedir)/Ice/ObjectFactoryF.ice \
-    $(slicedir)/Ice/RouterF.ice \
-    $(slicedir)/Ice/LocatorF.ice \
-    $(slicedir)/Ice/PluginF.ice \
-    $(slicedir)/Ice/ImplicitContextF.ice \
-    $(slicedir)/Ice/Current.ice \
-    $(slicedir)/Ice/ConnectionF.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Version.ice \
-    $(slicedir)/Ice/Properties.ice \
-    $(slicedir)/Ice/PropertiesAdmin.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/FacetMap.ice
+    "$(slicedir)\Ice\Communicator.ice" \
+    "$(slicedir)/Ice/LoggerF.ice" \
+    "$(slicedir)/Ice/InstrumentationF.ice" \
+    "$(slicedir)/Ice/ObjectAdapterF.ice" \
+    "$(slicedir)/Ice/ObjectFactoryF.ice" \
+    "$(slicedir)/Ice/RouterF.ice" \
+    "$(slicedir)/Ice/LocatorF.ice" \
+    "$(slicedir)/Ice/PluginF.ice" \
+    "$(slicedir)/Ice/ImplicitContextF.ice" \
+    "$(slicedir)/Ice/Current.ice" \
+    "$(slicedir)/Ice/ConnectionF.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Version.ice" \
+    "$(slicedir)/Ice/Properties.ice" \
+    "$(slicedir)/Ice/PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/FacetMap.ice"
 
 Ice_CommunicatorF_ice.py: \
-    $(slicedir)\Ice\CommunicatorF.ice
+    "$(slicedir)\Ice\CommunicatorF.ice"
 
 Ice_Connection_ice.py: \
-    $(slicedir)\Ice\Connection.ice \
-    $(slicedir)/Ice/ObjectAdapterF.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Endpoint.ice \
-    $(slicedir)/Ice/Version.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/EndpointF.ice
+    "$(slicedir)\Ice\Connection.ice" \
+    "$(slicedir)/Ice/ObjectAdapterF.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Endpoint.ice" \
+    "$(slicedir)/Ice/Version.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/EndpointF.ice"
 
 Ice_ConnectionF_ice.py: \
-    $(slicedir)\Ice\ConnectionF.ice
+    "$(slicedir)\Ice\ConnectionF.ice"
 
 Ice_Current_ice.py: \
-    $(slicedir)\Ice\Current.ice \
-    $(slicedir)/Ice/ObjectAdapterF.ice \
-    $(slicedir)/Ice/ConnectionF.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Version.ice
+    "$(slicedir)\Ice\Current.ice" \
+    "$(slicedir)/Ice/ObjectAdapterF.ice" \
+    "$(slicedir)/Ice/ConnectionF.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Version.ice"
 
 Ice_Endpoint_ice.py: \
-    $(slicedir)\Ice\Endpoint.ice \
-    $(slicedir)/Ice/Version.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/EndpointF.ice
+    "$(slicedir)\Ice\Endpoint.ice" \
+    "$(slicedir)/Ice/Version.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/EndpointF.ice"
 
 Ice_EndpointF_ice.py: \
-    $(slicedir)\Ice\EndpointF.ice
+    "$(slicedir)\Ice\EndpointF.ice"
 
 Ice_EndpointTypes_ice.py: \
-    $(slicedir)\Ice\EndpointTypes.ice
+    "$(slicedir)\Ice\EndpointTypes.ice"
 
 Ice_FacetMap_ice.py: \
-    $(slicedir)\Ice\FacetMap.ice
+    "$(slicedir)\Ice\FacetMap.ice"
 
 Ice_Identity_ice.py: \
-    $(slicedir)\Ice\Identity.ice
+    "$(slicedir)\Ice\Identity.ice"
 
 Ice_ImplicitContext_ice.py: \
-    $(slicedir)\Ice\ImplicitContext.ice \
-    $(slicedir)/Ice/LocalException.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Version.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/Current.ice \
-    $(slicedir)/Ice/ObjectAdapterF.ice \
-    $(slicedir)/Ice/ConnectionF.ice
+    "$(slicedir)\Ice\ImplicitContext.ice" \
+    "$(slicedir)/Ice/LocalException.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Version.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/Current.ice" \
+    "$(slicedir)/Ice/ObjectAdapterF.ice" \
+    "$(slicedir)/Ice/ConnectionF.ice"
 
 Ice_ImplicitContextF_ice.py: \
-    $(slicedir)\Ice\ImplicitContextF.ice
+    "$(slicedir)\Ice\ImplicitContextF.ice"
 
 Ice_Instrumentation_ice.py: \
-    $(slicedir)\Ice\Instrumentation.ice \
-    $(slicedir)/Ice/EndpointF.ice \
-    $(slicedir)/Ice/ConnectionF.ice \
-    $(slicedir)/Ice/Current.ice \
-    $(slicedir)/Ice/ObjectAdapterF.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Version.ice
+    "$(slicedir)\Ice\Instrumentation.ice" \
+    "$(slicedir)/Ice/EndpointF.ice" \
+    "$(slicedir)/Ice/ConnectionF.ice" \
+    "$(slicedir)/Ice/Current.ice" \
+    "$(slicedir)/Ice/ObjectAdapterF.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Version.ice"
 
 Ice_InstrumentationF_ice.py: \
-    $(slicedir)\Ice\InstrumentationF.ice
+    "$(slicedir)\Ice\InstrumentationF.ice"
 
 Ice_LocalException_ice.py: \
-    $(slicedir)\Ice\LocalException.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Version.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Ice\LocalException.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Version.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Ice_Locator_ice.py: \
-    $(slicedir)\Ice\Locator.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/ProcessF.ice
+    "$(slicedir)\Ice\Locator.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/ProcessF.ice"
 
 Ice_LocatorF_ice.py: \
-    $(slicedir)\Ice\LocatorF.ice
+    "$(slicedir)\Ice\LocatorF.ice"
 
 Ice_Logger_ice.py: \
-    $(slicedir)\Ice\Logger.ice
+    "$(slicedir)\Ice\Logger.ice"
 
 Ice_LoggerF_ice.py: \
-    $(slicedir)\Ice\LoggerF.ice
+    "$(slicedir)\Ice\LoggerF.ice"
 
 Ice_Metrics_ice.py: \
-    $(slicedir)\Ice\Metrics.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Ice\Metrics.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Ice_ObjectAdapter_ice.py: \
-    $(slicedir)\Ice\ObjectAdapter.ice \
-    $(slicedir)/Ice/CommunicatorF.ice \
-    $(slicedir)/Ice/ServantLocatorF.ice \
-    $(slicedir)/Ice/LocatorF.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/FacetMap.ice \
-    $(slicedir)/Ice/Endpoint.ice \
-    $(slicedir)/Ice/Version.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/EndpointF.ice
+    "$(slicedir)\Ice\ObjectAdapter.ice" \
+    "$(slicedir)/Ice/CommunicatorF.ice" \
+    "$(slicedir)/Ice/ServantLocatorF.ice" \
+    "$(slicedir)/Ice/LocatorF.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/FacetMap.ice" \
+    "$(slicedir)/Ice/Endpoint.ice" \
+    "$(slicedir)/Ice/Version.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/EndpointF.ice"
 
 Ice_ObjectAdapterF_ice.py: \
-    $(slicedir)\Ice\ObjectAdapterF.ice
+    "$(slicedir)\Ice\ObjectAdapterF.ice"
 
 Ice_ObjectFactory_ice.py: \
-    $(slicedir)\Ice\ObjectFactory.ice
+    "$(slicedir)\Ice\ObjectFactory.ice"
 
 Ice_ObjectFactoryF_ice.py: \
-    $(slicedir)\Ice\ObjectFactoryF.ice
+    "$(slicedir)\Ice\ObjectFactoryF.ice"
 
 Ice_Plugin_ice.py: \
-    $(slicedir)\Ice\Plugin.ice \
-    $(slicedir)/Ice/LoggerF.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Ice\Plugin.ice" \
+    "$(slicedir)/Ice/LoggerF.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Ice_PluginF_ice.py: \
-    $(slicedir)\Ice\PluginF.ice
+    "$(slicedir)\Ice\PluginF.ice"
 
 Ice_Process_ice.py: \
-    $(slicedir)\Ice\Process.ice
+    "$(slicedir)\Ice\Process.ice"
 
 Ice_ProcessF_ice.py: \
-    $(slicedir)\Ice\ProcessF.ice
+    "$(slicedir)\Ice\ProcessF.ice"
 
 Ice_Properties_ice.py: \
-    $(slicedir)\Ice\Properties.ice \
-    $(slicedir)/Ice/PropertiesAdmin.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Ice\Properties.ice" \
+    "$(slicedir)/Ice/PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Ice_PropertiesAdmin_ice.py: \
-    $(slicedir)\Ice\PropertiesAdmin.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Ice\PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Ice_PropertiesF_ice.py: \
-    $(slicedir)\Ice\PropertiesF.ice
+    "$(slicedir)\Ice\PropertiesF.ice"
 
 Ice_Router_ice.py: \
-    $(slicedir)\Ice\Router.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Ice\Router.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Ice_RouterF_ice.py: \
-    $(slicedir)\Ice\RouterF.ice
+    "$(slicedir)\Ice\RouterF.ice"
 
 Ice_ServantLocator_ice.py: \
-    $(slicedir)\Ice\ServantLocator.ice \
-    $(slicedir)/Ice/ObjectAdapterF.ice \
-    $(slicedir)/Ice/Current.ice \
-    $(slicedir)/Ice/ConnectionF.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/Version.ice
+    "$(slicedir)\Ice\ServantLocator.ice" \
+    "$(slicedir)/Ice/ObjectAdapterF.ice" \
+    "$(slicedir)/Ice/Current.ice" \
+    "$(slicedir)/Ice/ConnectionF.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/Version.ice"
 
 Ice_ServantLocatorF_ice.py: \
-    $(slicedir)\Ice\ServantLocatorF.ice
+    "$(slicedir)\Ice\ServantLocatorF.ice"
 
 Ice_SliceChecksumDict_ice.py: \
-    $(slicedir)\Ice\SliceChecksumDict.ice
+    "$(slicedir)\Ice\SliceChecksumDict.ice"
 
 Ice_Version_ice.py: \
-    $(slicedir)\Ice\Version.ice
+    "$(slicedir)\Ice\Version.ice"
 
 Glacier2_Metrics_ice.py: \
-    $(slicedir)\Glacier2\Metrics.ice \
-    $(slicedir)/Ice/Metrics.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Glacier2\Metrics.ice" \
+    "$(slicedir)/Ice/Metrics.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Glacier2_PermissionsVerifier_ice.py: \
-    $(slicedir)\Glacier2\PermissionsVerifier.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Glacier2\PermissionsVerifier.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 Glacier2_PermissionsVerifierF_ice.py: \
-    $(slicedir)\Glacier2\PermissionsVerifierF.ice
+    "$(slicedir)\Glacier2\PermissionsVerifierF.ice"
 
 Glacier2_Router_ice.py: \
-    $(slicedir)\Glacier2\Router.ice \
-    $(slicedir)/Ice/Router.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Glacier2/Session.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/Glacier2/PermissionsVerifier.ice
+    "$(slicedir)\Glacier2\Router.ice" \
+    "$(slicedir)/Ice/Router.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Glacier2/Session.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/Glacier2/PermissionsVerifier.ice"
 
 Glacier2_RouterF_ice.py: \
-    $(slicedir)\Glacier2\RouterF.ice
+    "$(slicedir)\Glacier2\RouterF.ice"
 
 Glacier2_Session_ice.py: \
-    $(slicedir)\Glacier2\Session.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice
+    "$(slicedir)\Glacier2\Session.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice"
 
 Glacier2_SSLInfo_ice.py: \
-    $(slicedir)\Glacier2\SSLInfo.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\Glacier2\SSLInfo.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 IceBox_IceBox_ice.py: \
-    $(slicedir)\IceBox\IceBox.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/CommunicatorF.ice \
-    $(slicedir)/Ice/PropertiesF.ice \
-    $(slicedir)/Ice/SliceChecksumDict.ice
+    "$(slicedir)\IceBox\IceBox.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/CommunicatorF.ice" \
+    "$(slicedir)/Ice/PropertiesF.ice" \
+    "$(slicedir)/Ice/SliceChecksumDict.ice"
 
 IceGrid_Admin_ice.py: \
-    $(slicedir)\IceGrid\Admin.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/Properties.ice \
-    $(slicedir)/Ice/PropertiesAdmin.ice \
-    $(slicedir)/Ice/SliceChecksumDict.ice \
-    $(slicedir)/Glacier2/Session.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/IceGrid/Exception.ice \
-    $(slicedir)/IceGrid/Descriptor.ice
+    "$(slicedir)\IceGrid\Admin.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/Properties.ice" \
+    "$(slicedir)/Ice/PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/SliceChecksumDict.ice" \
+    "$(slicedir)/Glacier2/Session.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/IceGrid/Exception.ice" \
+    "$(slicedir)/IceGrid/Descriptor.ice"
 
 IceGrid_Descriptor_ice.py: \
-    $(slicedir)\IceGrid\Descriptor.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\IceGrid\Descriptor.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 IceGrid_Exception_ice.py: \
-    $(slicedir)\IceGrid\Exception.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\IceGrid\Exception.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 IceGrid_FileParser_ice.py: \
-    $(slicedir)\IceGrid\FileParser.ice \
-    $(slicedir)/IceGrid/Admin.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/Properties.ice \
-    $(slicedir)/Ice/PropertiesAdmin.ice \
-    $(slicedir)/Ice/SliceChecksumDict.ice \
-    $(slicedir)/Glacier2/Session.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/IceGrid/Exception.ice \
-    $(slicedir)/IceGrid/Descriptor.ice
+    "$(slicedir)\IceGrid\FileParser.ice" \
+    "$(slicedir)/IceGrid/Admin.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/Properties.ice" \
+    "$(slicedir)/Ice/PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/SliceChecksumDict.ice" \
+    "$(slicedir)/Glacier2/Session.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/IceGrid/Exception.ice" \
+    "$(slicedir)/IceGrid/Descriptor.ice"
 
 IceGrid_Locator_ice.py: \
-    $(slicedir)\IceGrid\Locator.ice \
-    $(slicedir)/Ice/Locator.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/ProcessF.ice
+    "$(slicedir)\IceGrid\Locator.ice" \
+    "$(slicedir)/Ice/Locator.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/ProcessF.ice"
 
 IceGrid_Observer_ice.py: \
-    $(slicedir)\IceGrid\Observer.ice \
-    $(slicedir)/Glacier2/Session.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/IceGrid/Exception.ice \
-    $(slicedir)/IceGrid/Descriptor.ice \
-    $(slicedir)/IceGrid/Admin.ice \
-    $(slicedir)/Ice/Properties.ice \
-    $(slicedir)/Ice/PropertiesAdmin.ice \
-    $(slicedir)/Ice/SliceChecksumDict.ice
+    "$(slicedir)\IceGrid\Observer.ice" \
+    "$(slicedir)/Glacier2/Session.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/IceGrid/Exception.ice" \
+    "$(slicedir)/IceGrid/Descriptor.ice" \
+    "$(slicedir)/IceGrid/Admin.ice" \
+    "$(slicedir)/Ice/Properties.ice" \
+    "$(slicedir)/Ice/PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/SliceChecksumDict.ice"
 
 IceGrid_Query_ice.py: \
-    $(slicedir)\IceGrid\Query.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/IceGrid/Exception.ice
+    "$(slicedir)\IceGrid\Query.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/IceGrid/Exception.ice"
 
 IceGrid_Registry_ice.py: \
-    $(slicedir)\IceGrid\Registry.ice \
-    $(slicedir)/IceGrid/Exception.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/IceGrid/Session.ice \
-    $(slicedir)/Glacier2/Session.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/IceGrid/Admin.ice \
-    $(slicedir)/Ice/Properties.ice \
-    $(slicedir)/Ice/PropertiesAdmin.ice \
-    $(slicedir)/Ice/SliceChecksumDict.ice \
-    $(slicedir)/IceGrid/Descriptor.ice
+    "$(slicedir)\IceGrid\Registry.ice" \
+    "$(slicedir)/IceGrid/Exception.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/IceGrid/Session.ice" \
+    "$(slicedir)/Glacier2/Session.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/IceGrid/Admin.ice" \
+    "$(slicedir)/Ice/Properties.ice" \
+    "$(slicedir)/Ice/PropertiesAdmin.ice" \
+    "$(slicedir)/Ice/SliceChecksumDict.ice" \
+    "$(slicedir)/IceGrid/Descriptor.ice"
 
 IceGrid_Session_ice.py: \
-    $(slicedir)\IceGrid\Session.ice \
-    $(slicedir)/Glacier2/Session.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Glacier2/SSLInfo.ice \
-    $(slicedir)/IceGrid/Exception.ice
+    "$(slicedir)\IceGrid\Session.ice" \
+    "$(slicedir)/Glacier2/Session.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Glacier2/SSLInfo.ice" \
+    "$(slicedir)/IceGrid/Exception.ice"
 
 IceGrid_UserAccountMapper_ice.py: \
-    $(slicedir)\IceGrid\UserAccountMapper.ice
+    "$(slicedir)\IceGrid\UserAccountMapper.ice"
 
 IcePatch2_FileInfo_ice.py: \
-    $(slicedir)\IcePatch2\FileInfo.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\IcePatch2\FileInfo.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 IcePatch2_FileServer_ice.py: \
-    $(slicedir)\IcePatch2\FileServer.ice \
-    $(slicedir)/IcePatch2/FileInfo.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\IcePatch2\FileServer.ice" \
+    "$(slicedir)/IcePatch2/FileInfo.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 IceStorm_Metrics_ice.py: \
-    $(slicedir)\IceStorm\Metrics.ice \
-    $(slicedir)/Ice/Metrics.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\IceStorm\Metrics.ice" \
+    "$(slicedir)/Ice/Metrics.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
 
 IceStorm_IceStorm_ice.py: \
-    $(slicedir)\IceStorm\IceStorm.ice \
-    $(slicedir)/Ice/Identity.ice \
-    $(slicedir)/Ice/SliceChecksumDict.ice \
-    $(slicedir)/IceStorm/Metrics.ice \
-    $(slicedir)/Ice/Metrics.ice \
-    $(slicedir)/Ice/BuiltinSequences.ice
+    "$(slicedir)\IceStorm\IceStorm.ice" \
+    "$(slicedir)/Ice/Identity.ice" \
+    "$(slicedir)/Ice/SliceChecksumDict.ice" \
+    "$(slicedir)/IceStorm/Metrics.ice" \
+    "$(slicedir)/Ice/Metrics.ice" \
+    "$(slicedir)/Ice/BuiltinSequences.ice"
diff --git a/py/python/Ice.py b/py/python/Ice.py
index ef8c253d829..b8c9f0a8721 100644
--- a/py/python/Ice.py
+++ b/py/python/Ice.py
@@ -501,6 +501,39 @@ define the start and stop methods.'''
 to terminate.'''
         pass
 
+class BatchRequest(object):
+    '''Base class for batch request interceptor. A subclass must
+define the enqueue method.'''
+    def __init__(self, size, operation, proxy):
+        self._size = size
+        self._operation = operation
+        self._proxy = proxy
+
+    def getSize():
+        return self._size
+
+    def getOperation():
+        return self._operation
+
+    def getProxy():
+        return self._proxy
+
+    def enqueue():
+        '''Call enqueue from the batch request interceptor enqueue
+implementation to confirm the batching a this request.'''
+        pass
+
+class BatchRequestInterceptor(object):
+    '''Base class for batch request interceptor. A subclass must
+define the enqueue method.'''
+
+    def __init__(self):
+        pass
+
+    def enqueue(request, queueCount, queueSize):
+        '''Invoked when a request is batched.'''
+        pass
+
 #
 # Initialization data.
 #
@@ -518,8 +551,8 @@ threadHook: An object that implements ThreadNotification.
     def __init__(self):
         self.properties = None
         self.logger = None
-        #self.stats = None # Stats not currently supported in Python.
         self.threadHook = None
+        self.batchRequestInterceptor = None
 
 #
 # Communicator wrapper.
@@ -630,7 +663,7 @@ class CommunicatorI(Communicator):
 
     def createAdmin(self, adminAdapter, adminIdentity):
         return self._impl.createAdmin(adminAdapter, adminIdentity)
-    
+
     def getAdmin(self):
         return self._impl.getAdmin()
 
@@ -780,7 +813,7 @@ class ObjectAdapterI(ObjectAdapter):
 
     def getLocator(self):
         return self._impl.getLocator()
-    
+
     def refreshPublishedEndpoints(self):
         self._impl.refreshPublishedEndpoints()
 
@@ -931,7 +964,7 @@ class ImplicitContextI(ImplicitContext):
     def remove(self, key):
         return self._impl.remove(key)
 
-    
+
 #
 # Its not possible to block in a python signal handler since this
 # blocks the main thread from doing further work. As such we queue the
@@ -1151,10 +1184,10 @@ value is an integer representing the exit status.
         #
         # Set _ctrlCHandler to 0 only once communicator.destroy() has
         # completed.
-        # 
+        #
         Application._ctrlCHandler.destroy()
         Application._ctrlCHandler = None
-        
+
         return status
 
     def doMain(self, args, initData):
@@ -1166,7 +1199,7 @@ value is an integer representing the exit status.
         except:
             getProcessLogger().error(traceback.format_exc())
             status = 1
-        
+
         #
         # Don't want any new interrupt and at this point (post-run),
         # it would not make sense to release a held signal to run
@@ -1196,7 +1229,7 @@ value is an integer representing the exit status.
             except:
                 getProcessLogger().error(traceback.format_exc())
                 status = 1
-            Application._communicator = None        
+            Application._communicator = None
         return status
 
     def run(self, args):