diff --git a/slice2cpp/cpp/src/IceGrid/Internal.cpp b/slice2cpp/cpp/src/IceGrid/Internal.cpp
index 10f214508958..786ce1b1b4f6 100644
--- a/slice2cpp/cpp/src/IceGrid/Internal.cpp
+++ b/slice2cpp/cpp/src/IceGrid/Internal.cpp
@@ -1700,11 +1700,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerNode(const ::std::shared_ptr<::IceIn
             {
                 ex.ice_throw();
             }
-            catch(const NodeActiveException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
-            catch(const PermissionDeniedException&)
+            catch(const NodeActiveException&)
             {
                 throw;
             }
@@ -1750,11 +1750,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerReplica(const ::std::shared_ptr<::Ic
             {
                 ex.ice_throw();
             }
-            catch(const ReplicaActiveException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
-            catch(const PermissionDeniedException&)
+            catch(const ReplicaActiveException&)
             {
                 throw;
             }
diff --git a/slice2cpp/cpp/test/Ice/exceptions/Test.cpp b/slice2cpp/cpp/test/Ice/exceptions/Test.cpp
index 75d4d2cd2545..62d62a050e42 100644
--- a/slice2cpp/cpp/test/Ice/exceptions/Test.cpp
+++ b/slice2cpp/cpp/test/Ice/exceptions/Test.cpp
@@ -220,11 +220,11 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O
             {
                 ex.ice_throw();
             }
-            catch(const A&)
+            catch(const D&)
             {
                 throw;
             }
-            catch(const D&)
+            catch(const A&)
             {
                 throw;
             }
diff --git a/slice2cs/cpp/src/IceStorm/IceStormInternal.cs b/slice2cs/cpp/src/IceStorm/IceStormInternal.cs
index ba2ecd2e48f3..a8e4f058cb8d 100644
--- a/slice2cs/cpp/src/IceStorm/IceStormInternal.cs
+++ b/slice2cs/cpp/src/IceStorm/IceStormInternal.cs
@@ -1301,6 +1301,12 @@ public abstract class TopicInternalDisp_ : Ice.ObjectImpl, TopicInternal
 
         public abstract void reap(global::Ice.Identity[] id, Ice.Current current);
 
+        public abstract LinkInfo[] getLinkInfoSeq(Ice.Current current);
+
+        public abstract global::Ice.Identity[] getSubscribers(Ice.Current current);
+
+        public abstract void destroy(Ice.Current current);
+
         public abstract string getName(Ice.Current current);
 
         public abstract global::Ice.ObjectPrx? getPublisher(Ice.Current current);
@@ -1315,12 +1321,6 @@ public abstract class TopicInternalDisp_ : Ice.ObjectImpl, TopicInternal
 
         public abstract void unlink(TopicPrx? linkTo, Ice.Current current);
 
-        public abstract LinkInfo[] getLinkInfoSeq(Ice.Current current);
-
-        public abstract global::Ice.Identity[] getSubscribers(Ice.Current current);
-
-        public abstract void destroy(Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::IceStorm::TopicInternal";
diff --git a/slice2cs/cpp/test/Ice/exceptions/TestAMD.cs b/slice2cs/cpp/test/Ice/exceptions/TestAMD.cs
index 03538d8de73b..216e77c73e89 100644
--- a/slice2cs/cpp/test/Ice/exceptions/TestAMD.cs
+++ b/slice2cs/cpp/test/Ice/exceptions/TestAMD.cs
@@ -921,11 +921,11 @@ private void _iceI_throwAorDasAorD(int iceP_a, global::System.Collections.Generi
                     {
                         throw ex;
                     }
-                    catch(A)
+                    catch(D)
                     {
                         throw;
                     }
-                    catch(D)
+                    catch(A)
                     {
                         throw;
                     }
diff --git a/slice2cs/cpp/test/Ice/operations/TestAMD.cs b/slice2cs/cpp/test/Ice/operations/TestAMD.cs
index 726451116bb3..27dc4493398f 100644
--- a/slice2cs/cpp/test/Ice/operations/TestAMD.cs
+++ b/slice2cs/cpp/test/Ice/operations/TestAMD.cs
@@ -10024,37 +10024,7 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyStruct1> opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current);
 
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpLongFloatDSResult> opLongFloatDSAsync(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringStringDSResult> opStringStringDSAsync(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringMyEnumDSResult> opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary<string, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, MyEnum>[] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumStringDSResult> opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary<MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<MyEnum, string>[] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyStructMyEnumDSResult> opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteByteSDResult> opByteByteSDAsync(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolBoolSDResult> opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortShortSDResult> opShortShortSDAsync(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpIntIntSDResult> opIntIntSDAsync(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpLongLongSDResult> opLongLongSDAsync(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringFloatSDResult> opStringFloatSDAsync(global::System.Collections.Generic.Dictionary<string, float[]> p1, global::System.Collections.Generic.Dictionary<string, float[]> p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringDoubleSDResult> opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary<string, double[]> p1, global::System.Collections.Generic.Dictionary<string, double[]> p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringStringSDResult> opStringStringSDAsync(global::System.Collections.Generic.Dictionary<string, string[]> p1, global::System.Collections.Generic.Dictionary<string, string[]> p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumMyEnumSDResult> opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p1, global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<int[]> opIntSAsync(int[] s, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current);
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
 
@@ -10118,6 +10088,38 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntDSResult> opShortIntDSAsync(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, Ice.Current current);
 
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpLongFloatDSResult> opLongFloatDSAsync(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringStringDSResult> opStringStringDSAsync(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringMyEnumDSResult> opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary<string, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, MyEnum>[] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumStringDSResult> opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary<MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<MyEnum, string>[] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyStructMyEnumDSResult> opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteByteSDResult> opByteByteSDAsync(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolBoolSDResult> opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortShortSDResult> opShortShortSDAsync(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpIntIntSDResult> opIntIntSDAsync(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpLongLongSDResult> opLongLongSDAsync(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringFloatSDResult> opStringFloatSDAsync(global::System.Collections.Generic.Dictionary<string, float[]> p1, global::System.Collections.Generic.Dictionary<string, float[]> p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringDoubleSDResult> opStringDoubleSDAsync(global::System.Collections.Generic.Dictionary<string, double[]> p1, global::System.Collections.Generic.Dictionary<string, double[]> p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringStringSDResult> opStringStringSDAsync(global::System.Collections.Generic.Dictionary<string, string[]> p1, global::System.Collections.Generic.Dictionary<string, string[]> p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumMyEnumSDResult> opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p1, global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<int[]> opIntSAsync(int[] s, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current);
+
         public abstract global::System.Threading.Tasks.Task<int> opByteSOnewayCallCountAsync(Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task<global::System.Collections.Generic.Dictionary<string, string>> opContextAsync(Ice.Current current);
@@ -10162,8 +10164,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict1MarshaledResult> opMDict1Async(Ice.Current current);
 
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
diff --git a/slice2cs/csharp/test/Ice/operations/Test.cs b/slice2cs/csharp/test/Ice/operations/Test.cs
index 24fe6fa3bfb7..4b05cf3dec32 100644
--- a/slice2cs/csharp/test/Ice/operations/Test.cs
+++ b/slice2cs/csharp/test/Ice/operations/Test.cs
@@ -13435,28 +13435,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current);
 
-            public abstract void shutdown(Ice.Current current);
-
-            public abstract bool supportsCompress(Ice.Current current);
-
-            public abstract void opVoid(Ice.Current current);
-
-            public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-            public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-            public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-            public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-            public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-            public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
-
-            public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
-
-            public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
-
             public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
 
             public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
@@ -13533,6 +13511,16 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Collections.Generic.Dictionary<string, string> opContext(Ice.Current current);
 
+            public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current);
+
+            public abstract void opIdempotent(Ice.Current current);
+
+            public abstract byte opByte1(byte opByte1, Ice.Current current);
+
+            public abstract short opShort1(short opShort1, Ice.Current current);
+
+            public abstract int opInt1(int opInt1, Ice.Current current);
+
             public abstract long opLong1(long opLong1, Ice.Current current);
 
             public abstract float opFloat1(float opFloat1, Ice.Current current);
@@ -13565,15 +13553,27 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
-            public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current);
+            public abstract void shutdown(Ice.Current current);
 
-            public abstract void opIdempotent(Ice.Current current);
+            public abstract bool supportsCompress(Ice.Current current);
 
-            public abstract byte opByte1(byte opByte1, Ice.Current current);
+            public abstract void opVoid(Ice.Current current);
 
-            public abstract short opShort1(short opShort1, Ice.Current current);
+            public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
 
-            public abstract int opInt1(int opInt1, Ice.Current current);
+            public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+            public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+            public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+            public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+            public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
+
+            public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
+
+            public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
 
             public override string ice_id(Ice.Current current) => ice_staticId();
 
@@ -13669,28 +13669,6 @@ namespace Test2
 {
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
-        public abstract void shutdown(Ice.Current current);
-
-        public abstract bool supportsCompress(Ice.Current current);
-
-        public abstract void opVoid(Ice.Current current);
-
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract global::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, Ice.Current current);
-
-        public abstract global::Ice.operations.Test.MyClassPrx? opMyClass(global::Ice.operations.Test.MyClassPrx? p1, out global::Ice.operations.Test.MyClassPrx? p2, out global::Ice.operations.Test.MyClassPrx? p3, Ice.Current current);
-
-        public abstract global::Ice.operations.Test.Structure opStruct(global::Ice.operations.Test.Structure p1, global::Ice.operations.Test.Structure p2, out global::Ice.operations.Test.Structure p3, Ice.Current current);
-
         public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
 
         public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
@@ -13767,6 +13745,16 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<string, string> opContext(Ice.Current current);
 
+        public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current);
+
+        public abstract void opIdempotent(Ice.Current current);
+
+        public abstract byte opByte1(byte opByte1, Ice.Current current);
+
+        public abstract short opShort1(short opShort1, Ice.Current current);
+
+        public abstract int opInt1(int opInt1, Ice.Current current);
+
         public abstract long opLong1(long opLong1, Ice.Current current);
 
         public abstract float opFloat1(float opFloat1, Ice.Current current);
@@ -13799,15 +13787,27 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::Ice.operations.Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
-        public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current);
+        public abstract void shutdown(Ice.Current current);
 
-        public abstract void opIdempotent(Ice.Current current);
+        public abstract bool supportsCompress(Ice.Current current);
 
-        public abstract byte opByte1(byte opByte1, Ice.Current current);
+        public abstract void opVoid(Ice.Current current);
 
-        public abstract short opShort1(short opShort1, Ice.Current current);
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
 
-        public abstract int opInt1(int opInt1, Ice.Current current);
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+        public abstract global::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, Ice.Current current);
+
+        public abstract global::Ice.operations.Test.MyClassPrx? opMyClass(global::Ice.operations.Test.MyClassPrx? p1, out global::Ice.operations.Test.MyClassPrx? p2, out global::Ice.operations.Test.MyClassPrx? p3, Ice.Current current);
+
+        public abstract global::Ice.operations.Test.Structure opStruct(global::Ice.operations.Test.Structure p1, global::Ice.operations.Test.Structure p2, out global::Ice.operations.Test.Structure p3, Ice.Current current);
 
         public override string ice_id(Ice.Current current) => ice_staticId();
 
diff --git a/slice2cs/csharp/test/Ice/operations/TestAMD.cs b/slice2cs/csharp/test/Ice/operations/TestAMD.cs
index 85e9b3685f74..17df5d7cd722 100644
--- a/slice2cs/csharp/test/Ice/operations/TestAMD.cs
+++ b/slice2cs/csharp/test/Ice/operations/TestAMD.cs
@@ -9868,6 +9868,42 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyStruct1> opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current);
 
+            public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpByteResult> opByteAsync(byte p1, byte p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolResult> opBoolAsync(bool p1, bool p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongResult> opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleResult> opFloatDoubleAsync(float p1, double p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpStringResult> opStringAsync(string p1, string p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumResult> opMyEnumAsync(MyEnum p1, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpMyClassResult> opMyClassAsync(MyClassPrx? p1, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpStructResult> opStructAsync(Structure p1, Structure p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSResult> opByteSAsync(byte[] p1, byte[] p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSResult> opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleSResult> opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpStringSResult> opStringSAsync(string[] p1, string[] p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSSResult> opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSSResult> opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current);
+
             public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSSResult> opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleSSResult> opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current);
@@ -9958,10 +9994,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<string[]> opStringLiteralsAsync(Ice.Current current);
 
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict1MarshaledResult> opMDict1Async(Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
-
             public abstract global::System.Threading.Tasks.Task<string[]> opWStringLiteralsAsync(Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct1MarshaledResult> opMStruct1Async(Ice.Current current);
@@ -9972,41 +10004,9 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq2MarshaledResult> opMSeq2Async(string[] p1, Ice.Current current);
 
-            public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpByteResult> opByteAsync(byte p1, byte p2, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolResult> opBoolAsync(bool p1, bool p2, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongResult> opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleResult> opFloatDoubleAsync(float p1, double p2, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpStringResult> opStringAsync(string p1, string p2, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumResult> opMyEnumAsync(MyEnum p1, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpMyClassResult> opMyClassAsync(MyClassPrx? p1, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpStructResult> opStructAsync(Structure p1, Structure p2, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSResult> opByteSAsync(byte[] p1, byte[] p2, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSResult> opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleSResult> opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpStringSResult> opStringSAsync(string[] p1, string[] p2, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSSResult> opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current);
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict1MarshaledResult> opMDict1Async(Ice.Current current);
 
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSSResult> opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current);
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
             public override string ice_id(Ice.Current current) => ice_staticId();
 
diff --git a/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs
index 1a2edd252430..dd2d3b56203b 100644
--- a/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs
+++ b/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs
@@ -9854,45 +9854,9 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyStruct1> opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current);
 
-        public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteResult> opByteAsync(byte p1, byte p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolResult> opBoolAsync(bool p1, bool p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongResult> opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleResult> opFloatDoubleAsync(float p1, double p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringResult> opStringAsync(string p1, string p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumResult> opMyEnumAsync(MyEnum p1, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyClassResult> opMyClassAsync(MyClassPrx? p1, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpStructResult> opStructAsync(Structure p1, Structure p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSResult> opByteSAsync(byte[] p1, byte[] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSResult> opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleSResult> opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringSResult> opStringSAsync(string[] p1, string[] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSSResult> opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSSResult> opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSSResult> opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current);
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict1MarshaledResult> opMDict1Async(Ice.Current current);
 
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleSSResult> opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current);
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpStringSSResult> opStringSSAsync(string[][] p1, string[][] p2, Ice.Current current);
 
@@ -9944,6 +9908,46 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumMyEnumSDResult> opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p1, global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p2, Ice.Current current);
 
+        public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteResult> opByteAsync(byte p1, byte p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolResult> opBoolAsync(bool p1, bool p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongResult> opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleResult> opFloatDoubleAsync(float p1, double p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringResult> opStringAsync(string p1, string p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumResult> opMyEnumAsync(MyEnum p1, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyClassResult> opMyClassAsync(MyClassPrx? p1, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpStructResult> opStructAsync(Structure p1, Structure p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSResult> opByteSAsync(byte[] p1, byte[] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSResult> opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleSResult> opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringSResult> opStringSAsync(string[] p1, string[] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSSResult> opByteSSAsync(byte[][] p1, byte[][] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSSResult> opBoolSSAsync(bool[][] p1, bool[][] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSSResult> opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleSSResult> opFloatDoubleSSAsync(float[][] p1, double[][] p2, Ice.Current current);
+
         public abstract global::System.Threading.Tasks.Task<int[]> opIntSAsync(int[] s, Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current);
@@ -9990,10 +9994,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq2MarshaledResult> opMSeq2Async(string[] p1, Ice.Current current);
 
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict1MarshaledResult> opMDict1Async(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
diff --git a/slice2cs/java/test/src/main/java/test/Ice/proxy/Test.cs b/slice2cs/java/test/src/main/java/test/Ice/proxy/Test.cs
index af68e891477a..118f138bf67f 100644
--- a/slice2cs/java/test/src/main/java/test/Ice/proxy/Test.cs
+++ b/slice2cs/java/test/src/main/java/test/Ice/proxy/Test.cs
@@ -783,12 +783,12 @@ public abstract class MyOtherDerivedClassDisp_ : Ice.ObjectImpl, MyOtherDerivedC
 
     public abstract class DiamondClassDisp_ : Ice.ObjectImpl, DiamondClass
     {
+        public abstract global::Ice.ObjectPrx? echo(global::Ice.ObjectPrx? obj, Ice.Current current);
+
         public abstract void shutdown(Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<string, string> getContext(Ice.Current current);
 
-        public abstract global::Ice.ObjectPrx? echo(global::Ice.ObjectPrx? obj, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::DiamondClass";
diff --git a/slice2cs/js/test/Ice/facets/Test.cs b/slice2cs/js/test/Ice/facets/Test.cs
index 10b6e3d68a7c..ffd430308728 100644
--- a/slice2cs/js/test/Ice/facets/Test.cs
+++ b/slice2cs/js/test/Ice/facets/Test.cs
@@ -1650,12 +1650,12 @@ public abstract class DDisp_ : Ice.ObjectImpl, D
     {
         public abstract string callD(Ice.Current current);
 
+        public abstract string callC(Ice.Current current);
+
         public abstract string callA(Ice.Current current);
 
         public abstract string callB(Ice.Current current);
 
-        public abstract string callC(Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::D";
diff --git a/slice2cs/matlab/test/Ice/operations/Test.cs b/slice2cs/matlab/test/Ice/operations/Test.cs
index 4ef038b4e666..0994c9476452 100644
--- a/slice2cs/matlab/test/Ice/operations/Test.cs
+++ b/slice2cs/matlab/test/Ice/operations/Test.cs
@@ -13325,6 +13325,74 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current);
 
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+        public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
+
+        public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
+
+        public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
+
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
+
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
+        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
+
+        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+
+        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+
+        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+
+        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+
+        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
+
+        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
+
+        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, MyEnum> p1, global::System.Collections.Generic.Dictionary<string, MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<MyEnum, string> p1, global::System.Collections.Generic.Dictionary<MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<MyEnum, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p2, out global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, MyEnum>[] p3, Ice.Current current);
+
         public abstract global::System.Collections.Generic.Dictionary<MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<MyEnum, string>[] p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p3, Ice.Current current);
@@ -13395,74 +13463,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
-        public abstract void shutdown(Ice.Current current);
-
-        public abstract bool supportsCompress(Ice.Current current);
-
-        public abstract void opVoid(Ice.Current current);
-
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
-
-        public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
-
-        public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
-
-        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
-
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
-
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
-
-        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
-
-        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
-
-        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
-
-        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
-
-        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
-
-        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
-
-        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
-
-        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, MyEnum> p1, global::System.Collections.Generic.Dictionary<string, MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<MyEnum, string> p1, global::System.Collections.Generic.Dictionary<MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<MyEnum, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p2, out global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, MyEnum>[] p3, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -13555,6 +13555,74 @@ namespace Test2
 {
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+        public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current);
+
+        public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current);
+
+        public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current);
+
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
+
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
+        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
+
+        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+
+        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+
+        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+
+        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+
+        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
+
+        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
+
+        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p3, Ice.Current current);
+
         public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p3, Ice.Current current);
@@ -13625,74 +13693,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
-        public abstract void shutdown(Ice.Current current);
-
-        public abstract bool supportsCompress(Ice.Current current);
-
-        public abstract void opVoid(Ice.Current current);
-
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current);
-
-        public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current);
-
-        public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current);
-
-        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
-
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
-
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
-
-        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
-
-        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
-
-        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
-
-        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
-
-        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
-
-        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
-
-        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
-
-        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p3, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";
diff --git a/slice2cs/php/test/Ice/operations/Test.cs b/slice2cs/php/test/Ice/operations/Test.cs
index b1d2049c8480..3479e7a5686f 100644
--- a/slice2cs/php/test/Ice/operations/Test.cs
+++ b/slice2cs/php/test/Ice/operations/Test.cs
@@ -12215,10 +12215,46 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyClass1? opMyClass1(MyClass1? c, Ice.Current current);
 
+        public abstract string[] opStringS2(string[] stringS, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
+
+        public abstract string[] opStringLiterals(Ice.Current current);
+
+        public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
+
+        public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current);
+
+        public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
+
+        public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
+
         public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
 
         public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, MyEnum> p1, global::System.Collections.Generic.Dictionary<string, MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<MyEnum, string> p1, global::System.Collections.Generic.Dictionary<MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<MyEnum, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
+
         public abstract void shutdown(Ice.Current current);
 
         public abstract bool supportsCompress(Ice.Current current);
@@ -12259,28 +12295,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
 
-        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, MyEnum> p1, global::System.Collections.Generic.Dictionary<string, MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<MyEnum, string> p1, global::System.Collections.Generic.Dictionary<MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<MyEnum, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
-
         public abstract global::System.Collections.Generic.Dictionary<string, MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, MyEnum>[] p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<MyEnum, string>[] p3, Ice.Current current);
@@ -12327,20 +12341,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
 
-        public abstract string[] opStringS2(string[] stringS, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
-
-        public abstract string[] opStringLiterals(Ice.Current current);
-
-        public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
-
-        public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current);
-
-        public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
-
-        public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -12427,10 +12427,46 @@ namespace Test2
 {
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
+        public abstract string[] opStringS2(string[] stringS, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
+
+        public abstract string[] opStringLiterals(Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
+
         public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
 
         public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
+
         public abstract void shutdown(Ice.Current current);
 
         public abstract bool supportsCompress(Ice.Current current);
@@ -12471,28 +12507,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
 
-        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
-
         public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] p3, Ice.Current current);
@@ -12539,20 +12553,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
 
-        public abstract string[] opStringS2(string[] stringS, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
-
-        public abstract string[] opStringLiterals(Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";
diff --git a/slice2cs/python/test/Ice/operations/Test.cs b/slice2cs/python/test/Ice/operations/Test.cs
index dfa1557be1f1..9e6b6a391d14 100644
--- a/slice2cs/python/test/Ice/operations/Test.cs
+++ b/slice2cs/python/test/Ice/operations/Test.cs
@@ -13370,10 +13370,16 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current);
 
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<MyEnum, string> p1, global::System.Collections.Generic.Dictionary<MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<MyEnum, string> p3, Ice.Current current);
+
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
 
         public abstract void opVoid(Ice.Current current);
 
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
         public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
 
         public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
@@ -13410,18 +13416,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, MyEnum> p1, global::System.Collections.Generic.Dictionary<string, MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<MyEnum, string> p1, global::System.Collections.Generic.Dictionary<MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<MyEnum, string> p3, Ice.Current current);
-
         public abstract global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p2, out global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
@@ -13506,9 +13500,15 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
-        public abstract void shutdown(Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
 
-        public abstract bool supportsCompress(Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, MyEnum> p1, global::System.Collections.Generic.Dictionary<string, MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, MyEnum> p3, Ice.Current current);
 
         public override string ice_id(Ice.Current current) => ice_staticId();
 
@@ -13603,10 +13603,16 @@ namespace Test2
 {
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p3, Ice.Current current);
+
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
 
         public abstract void opVoid(Ice.Current current);
 
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
         public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
 
         public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
@@ -13643,18 +13649,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p3, Ice.Current current);
-
         public abstract global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
@@ -13739,9 +13733,15 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
-        public abstract void shutdown(Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
 
-        public abstract bool supportsCompress(Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p3, Ice.Current current);
 
         public override string ice_id(Ice.Current current) => ice_staticId();
 
diff --git a/slice2cs/ruby/test/Ice/operations/Test.cs b/slice2cs/ruby/test/Ice/operations/Test.cs
index c7fc13b792cc..6348f070c99a 100644
--- a/slice2cs/ruby/test/Ice/operations/Test.cs
+++ b/slice2cs/ruby/test/Ice/operations/Test.cs
@@ -13061,54 +13061,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current);
 
-        public abstract void shutdown(Ice.Current current);
-
-        public abstract bool supportsCompress(Ice.Current current);
-
-        public abstract void opVoid(Ice.Current current);
-
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
-
-        public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
-
-        public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
-
-        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
-
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
-
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
-
-        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
-
-        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
-
-        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
-
-        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
-
-        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
-
-        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
-
-        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
-
-        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
         public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
@@ -13197,6 +13149,54 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+        public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
+
+        public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
+
+        public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
+
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
+
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
+        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
+
+        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+
+        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+
+        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+
+        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+
+        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
+
+        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
+
+        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -13288,54 +13288,6 @@ namespace Test2
 {
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
-        public abstract void shutdown(Ice.Current current);
-
-        public abstract bool supportsCompress(Ice.Current current);
-
-        public abstract void opVoid(Ice.Current current);
-
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current);
-
-        public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current);
-
-        public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current);
-
-        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
-
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
-
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
-
-        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
-
-        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
-
-        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
-
-        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
-
-        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
-
-        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
-
-        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
-
-        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
         public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
@@ -13424,6 +13376,54 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+        public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current);
+
+        public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current);
+
+        public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current);
+
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
+
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
+        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
+
+        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+
+        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+
+        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+
+        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+
+        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
+
+        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
+
+        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";
diff --git a/slice2cs/slice/Glacier2/Router.cs b/slice2cs/slice/Glacier2/Router.cs
index 3c41d5d80304..de3f3ba9f916 100644
--- a/slice2cs/slice/Glacier2/Router.cs
+++ b/slice2cs/slice/Glacier2/Router.cs
@@ -585,11 +585,11 @@ private void _iceI_createSession(string iceP_userId, string iceP_password, globa
                     {
                         throw ex;
                     }
-                    catch(PermissionDeniedException)
+                    catch(CannotCreateSessionException)
                     {
                         throw;
                     }
-                    catch(CannotCreateSessionException)
+                    catch(PermissionDeniedException)
                     {
                         throw;
                     }
@@ -635,11 +635,11 @@ private void _iceI_createSessionFromSecureConnection(global::System.Collections.
                     {
                         throw ex;
                     }
-                    catch(PermissionDeniedException)
+                    catch(CannotCreateSessionException)
                     {
                         throw;
                     }
-                    catch(CannotCreateSessionException)
+                    catch(PermissionDeniedException)
                     {
                         throw;
                     }
diff --git a/slice2cs/swift/test/Ice/operations/Test.cs b/slice2cs/swift/test/Ice/operations/Test.cs
index e7929203be26..0f0eba0232b6 100644
--- a/slice2cs/swift/test/Ice/operations/Test.cs
+++ b/slice2cs/swift/test/Ice/operations/Test.cs
@@ -13601,6 +13601,30 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current);
 
+        public abstract global::System.Collections.Generic.Dictionary<byte, byte[]> opByteByteSD(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, out global::System.Collections.Generic.Dictionary<byte, byte[]> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<bool, bool[]> opBoolBoolSD(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, out global::System.Collections.Generic.Dictionary<bool, bool[]> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<int, int[]> opIntIntSD(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, out global::System.Collections.Generic.Dictionary<int, int[]> p3, Ice.Current current);
+
+        public abstract string[] opStringLiterals(Ice.Current current);
+
+        public abstract string[] opWStringLiterals(Ice.Current current);
+
+        public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
+
+        public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current);
+
+        public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
+
+        public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
+
+        public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
+
+        public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
+
         public abstract void shutdown(Ice.Current current);
 
         public abstract bool supportsCompress(Ice.Current current);
@@ -13673,16 +13697,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p3, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<byte, byte[]> opByteByteSD(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, out global::System.Collections.Generic.Dictionary<byte, byte[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<bool, bool[]> opBoolBoolSD(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, out global::System.Collections.Generic.Dictionary<bool, bool[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<int, int[]> opIntIntSD(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, out global::System.Collections.Generic.Dictionary<int, int[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, long[]> opLongLongSD(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, out global::System.Collections.Generic.Dictionary<long, long[]> p3, Ice.Current current);
-
         public abstract global::System.Collections.Generic.Dictionary<string, float[]> opStringFloatSD(global::System.Collections.Generic.Dictionary<string, float[]> p1, global::System.Collections.Generic.Dictionary<string, float[]> p2, out global::System.Collections.Generic.Dictionary<string, float[]> p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<string, double[]> opStringDoubleSD(global::System.Collections.Generic.Dictionary<string, double[]> p1, global::System.Collections.Generic.Dictionary<string, double[]> p2, out global::System.Collections.Generic.Dictionary<string, double[]> p3, Ice.Current current);
@@ -13725,21 +13739,7 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
 
-        public abstract string[] opStringLiterals(Ice.Current current);
-
-        public abstract string[] opWStringLiterals(Ice.Current current);
-
-        public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
-
-        public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current);
-
-        public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
-
-        public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
-
-        public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
-
-        public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<long, long[]> opLongLongSD(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, out global::System.Collections.Generic.Dictionary<long, long[]> p3, Ice.Current current);
 
         public override string ice_id(Ice.Current current) => ice_staticId();
 
@@ -13834,6 +13834,30 @@ namespace Test2
 {
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
+        public abstract global::System.Collections.Generic.Dictionary<byte, byte[]> opByteByteSD(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, out global::System.Collections.Generic.Dictionary<byte, byte[]> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<bool, bool[]> opBoolBoolSD(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, out global::System.Collections.Generic.Dictionary<bool, bool[]> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<int, int[]> opIntIntSD(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, out global::System.Collections.Generic.Dictionary<int, int[]> p3, Ice.Current current);
+
+        public abstract string[] opStringLiterals(Ice.Current current);
+
+        public abstract string[] opWStringLiterals(Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
+
         public abstract void shutdown(Ice.Current current);
 
         public abstract bool supportsCompress(Ice.Current current);
@@ -13906,16 +13930,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p3, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<byte, byte[]> opByteByteSD(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, out global::System.Collections.Generic.Dictionary<byte, byte[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<bool, bool[]> opBoolBoolSD(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, out global::System.Collections.Generic.Dictionary<bool, bool[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<int, int[]> opIntIntSD(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, out global::System.Collections.Generic.Dictionary<int, int[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, long[]> opLongLongSD(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, out global::System.Collections.Generic.Dictionary<long, long[]> p3, Ice.Current current);
-
         public abstract global::System.Collections.Generic.Dictionary<string, float[]> opStringFloatSD(global::System.Collections.Generic.Dictionary<string, float[]> p1, global::System.Collections.Generic.Dictionary<string, float[]> p2, out global::System.Collections.Generic.Dictionary<string, float[]> p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<string, double[]> opStringDoubleSD(global::System.Collections.Generic.Dictionary<string, double[]> p1, global::System.Collections.Generic.Dictionary<string, double[]> p2, out global::System.Collections.Generic.Dictionary<string, double[]> p3, Ice.Current current);
@@ -13958,21 +13972,7 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
 
-        public abstract string[] opStringLiterals(Ice.Current current);
-
-        public abstract string[] opWStringLiterals(Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<long, long[]> opLongLongSD(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, out global::System.Collections.Generic.Dictionary<long, long[]> p3, Ice.Current current);
 
         public override string ice_id(Ice.Current current) => ice_staticId();
 
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java
index 9b5d37206663..33ebf0515b01 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java
@@ -228,5 +228,5 @@ static public java.util.Optional<DataSample> ice_read(com.zeroc.Ice.InputStream
     private static final DataSample _nullMarshalValue = new DataSample();
 
     /** @hidden */
-    private static final long serialVersionUID = 2515531218752817950L;
+    private static final long serialVersionUID = 1225993297750504123L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java
index 891c828ff3ea..0c95b8883ae1 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java
@@ -158,5 +158,5 @@ static public java.util.Optional<DataSamples> ice_read(com.zeroc.Ice.InputStream
     private static final DataSamples _nullMarshalValue = new DataSamples();
 
     /** @hidden */
-    private static final long serialVersionUID = 1810485226799109895L;
+    private static final long serialVersionUID = -3862139821673521796L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java
index 13d8a2dd277d..a7cadbc9c94a 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java
@@ -602,7 +602,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3057177366149751183L;
+    private static final long serialVersionUID = -6001277704374826284L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java
index f75a2771f752..fea920398f72 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java
@@ -180,5 +180,5 @@ static public java.util.Optional<ElementData> ice_read(com.zeroc.Ice.InputStream
     private static final ElementData _nullMarshalValue = new ElementData();
 
     /** @hidden */
-    private static final long serialVersionUID = -7833180302007017803L;
+    private static final long serialVersionUID = 7850198055922655143L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java
index cb4e1d2b5c94..95e6d622fae7 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java
@@ -209,5 +209,5 @@ static public java.util.Optional<ElementDataAck> ice_read(com.zeroc.Ice.InputStr
     private static final ElementDataAck _nullMarshalValue = new ElementDataAck();
 
     /** @hidden */
-    private static final long serialVersionUID = -8310229988059511422L;
+    private static final long serialVersionUID = -9006235899237425461L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java
index 817f348ef864..792c0a921b6f 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java
@@ -176,5 +176,5 @@ static public java.util.Optional<ElementInfo> ice_read(com.zeroc.Ice.InputStream
     private static final ElementInfo _nullMarshalValue = new ElementInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -8157947919507842656L;
+    private static final long serialVersionUID = 1181944498844203166L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java
index 3f7b9d3dc05d..180b8eb989e9 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java
@@ -220,5 +220,5 @@ static public java.util.Optional<ElementSpec> ice_read(com.zeroc.Ice.InputStream
     private static final ElementSpec _nullMarshalValue = new ElementSpec();
 
     /** @hidden */
-    private static final long serialVersionUID = -6244404074927435894L;
+    private static final long serialVersionUID = -7233497335102566439L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java
index 95dfe51c458f..2fd91cfeb882 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java
@@ -220,5 +220,5 @@ static public java.util.Optional<ElementSpecAck> ice_read(com.zeroc.Ice.InputStr
     private static final ElementSpecAck _nullMarshalValue = new ElementSpecAck();
 
     /** @hidden */
-    private static final long serialVersionUID = 5843249240685185927L;
+    private static final long serialVersionUID = 2546718663939981164L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java
index 6291e9fcbf69..4ddf47324840 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java
@@ -162,5 +162,5 @@ static public java.util.Optional<FilterInfo> ice_read(com.zeroc.Ice.InputStream
     private static final FilterInfo _nullMarshalValue = new FilterInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -3660115215406251682L;
+    private static final long serialVersionUID = 7896479468954690639L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java
index d77404d0f60c..cb5056fc5335 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java
@@ -167,5 +167,5 @@ static public java.util.Optional<TopicInfo> ice_read(com.zeroc.Ice.InputStream i
     private static final TopicInfo _nullMarshalValue = new TopicInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -7754235135653246037L;
+    private static final long serialVersionUID = 5577684359909684065L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java
index 792963b52856..276d30f5149b 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java
@@ -192,5 +192,5 @@ static public java.util.Optional<TopicSpec> ice_read(com.zeroc.Ice.InputStream i
     private static final TopicSpec _nullMarshalValue = new TopicSpec();
 
     /** @hidden */
-    private static final long serialVersionUID = -2980933792856116602L;
+    private static final long serialVersionUID = 5425911324134373522L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java
index 2bc22fe88c0b..9df3ffb6ab08 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3774322007181534099L;
+    private static final long serialVersionUID = 3774323331018931536L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java
index 5e4b0e61b3f8..6e255d2d082b 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7872702853718828917L;
+    private static final long serialVersionUID = 7872709792859029622L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java
index 8bda791d792a..4c16d4fb708f 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java
@@ -55,7 +55,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4334659861190506711L;
+    private static final long serialVersionUID = -4279626798842523927L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java
index 619c2422350a..fbaad51f656c 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java
@@ -55,7 +55,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8505270821444346867L;
+    private static final long serialVersionUID = -5156879772687258483L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
index c0c1f988435f..9c46a1f5414e 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
@@ -196,7 +196,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6336984380625057116L;
+    private static final long serialVersionUID = -4722372074049791681L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java
index 8a20bd302821..587df7f0c755 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java
@@ -59,7 +59,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6826545741995331076L;
+    private static final long serialVersionUID = 4293246562278361404L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java
index 57aa2bf8f8eb..049627497982 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java
@@ -272,7 +272,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5836868312126043030L;
+    private static final long serialVersionUID = -2597796721629331543L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java
index dbe8c29d72e7..75f5e3855416 100644
--- a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java
+++ b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java
@@ -155,5 +155,5 @@ static public java.util.Optional<AllData> ice_read(com.zeroc.Ice.InputStream ist
     private static final AllData _nullMarshalValue = new AllData();
 
     /** @hidden */
-    private static final long serialVersionUID = -4222339096191420559L;
+    private static final long serialVersionUID = 7138208851192996059L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java
index 7da0e46f09ef..acfb745821c8 100644
--- a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java
+++ b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java
@@ -195,5 +195,5 @@ static public java.util.Optional<EventData> ice_read(com.zeroc.Ice.InputStream i
     private static final EventData _nullMarshalValue = new EventData();
 
     /** @hidden */
-    private static final long serialVersionUID = 1805979452920932210L;
+    private static final long serialVersionUID = -6163264077316293732L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java
index 6b998c520307..d0b77cf0ae57 100644
--- a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java
+++ b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java
@@ -177,5 +177,5 @@ static public java.util.Optional<LinkRecord> ice_read(com.zeroc.Ice.InputStream
     private static final LinkRecord _nullMarshalValue = new LinkRecord();
 
     /** @hidden */
-    private static final long serialVersionUID = -4930558550780834759L;
+    private static final long serialVersionUID = 7856175132416280894L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java
index 78b09a932e96..9f7dbc31bb93 100644
--- a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java
+++ b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java
@@ -240,5 +240,5 @@ static public java.util.Optional<SubscriberRecord> ice_read(com.zeroc.Ice.InputS
     private static final SubscriberRecord _nullMarshalValue = new SubscriberRecord();
 
     /** @hidden */
-    private static final long serialVersionUID = 5402327057837267885L;
+    private static final long serialVersionUID = -8475553613586828833L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java
index 97faa5cf8418..3a2b15d422da 100644
--- a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java
+++ b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java
@@ -168,5 +168,5 @@ static public java.util.Optional<SubscriberRecordKey> ice_read(com.zeroc.Ice.Inp
     private static final SubscriberRecordKey _nullMarshalValue = new SubscriberRecordKey();
 
     /** @hidden */
-    private static final long serialVersionUID = 8941400328945496159L;
+    private static final long serialVersionUID = -8758126456681720929L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java
index b6b2acf09228..8d702a3b37ea 100644
--- a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java
+++ b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java
@@ -161,5 +161,5 @@ static public java.util.Optional<GroupInfo> ice_read(com.zeroc.Ice.InputStream i
     private static final GroupInfo _nullMarshalValue = new GroupInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -7321361084224176924L;
+    private static final long serialVersionUID = 1829939492090816260L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java
index 946b8f1047c4..4cba68f9a10d 100644
--- a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java
+++ b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java
@@ -157,5 +157,5 @@ static public java.util.Optional<LogUpdate> ice_read(com.zeroc.Ice.InputStream i
     private static final LogUpdate _nullMarshalValue = new LogUpdate();
 
     /** @hidden */
-    private static final long serialVersionUID = -7344392362363004028L;
+    private static final long serialVersionUID = 4935757634493504868L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java
index 5371955d0a09..6cd71136a026 100644
--- a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java
+++ b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java
@@ -161,5 +161,5 @@ static public java.util.Optional<NodeInfo> ice_read(com.zeroc.Ice.InputStream is
     private static final NodeInfo _nullMarshalValue = new NodeInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 4321652781179699795L;
+    private static final long serialVersionUID = 5680683619961183027L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java
index 05f3f73be20e..6003f37b6d8a 100644
--- a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java
+++ b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 938914387589817191L;
+    private static final long serialVersionUID = 938918881902149464L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java
index e41b3720497a..03b9c6820685 100644
--- a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java
+++ b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java
@@ -231,5 +231,5 @@ static public java.util.Optional<QueryInfo> ice_read(com.zeroc.Ice.InputStream i
     private static final QueryInfo _nullMarshalValue = new QueryInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -1012014716371026877L;
+    private static final long serialVersionUID = 8773751131972663036L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java
index ab4758833035..03fefe3b6631 100644
--- a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java
+++ b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java
@@ -162,5 +162,5 @@ static public java.util.Optional<TopicContent> ice_read(com.zeroc.Ice.InputStrea
     private static final TopicContent _nullMarshalValue = new TopicContent();
 
     /** @hidden */
-    private static final long serialVersionUID = 4646624677914293988L;
+    private static final long serialVersionUID = 4861341901243541124L;
 }
diff --git a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java
index cf8ee36f6b3d..639619eadd46 100644
--- a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java
+++ b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java
@@ -185,5 +185,5 @@ static public java.util.Optional<AllData> ice_read(com.zeroc.Ice.InputStream ist
     private static final AllData _nullMarshalValue = new AllData();
 
     /** @hidden */
-    private static final long serialVersionUID = 2702944983113518028L;
+    private static final long serialVersionUID = -6777012572988912886L;
 }
diff --git a/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java b/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java
index f9b25e0a621b..e8b0618a53e2 100644
--- a/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java
+++ b/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1632402985675973477L;
+    private static final long serialVersionUID = 1632392807699942900L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/api/Test/StructKey.java b/slice2java/cpp/test/DataStorm/api/Test/StructKey.java
index 8a1ee6aca427..25d449dcb711 100644
--- a/slice2java/cpp/test/DataStorm/api/Test/StructKey.java
+++ b/slice2java/cpp/test/DataStorm/api/Test/StructKey.java
@@ -138,5 +138,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = -8144777146707643467L;
+    private static final long serialVersionUID = -8144786994068046172L;
 }
diff --git a/slice2java/cpp/test/DataStorm/events/Test/Base.java b/slice2java/cpp/test/DataStorm/events/Test/Base.java
index 0090e2f62d4a..a516c579399e 100644
--- a/slice2java/cpp/test/DataStorm/events/Test/Base.java
+++ b/slice2java/cpp/test/DataStorm/events/Test/Base.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2623894828022066149L;
+    private static final long serialVersionUID = -2623894720910968632L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/events/Test/Extended.java b/slice2java/cpp/test/DataStorm/events/Test/Extended.java
index 53cdd8786c6a..a9606869c178 100644
--- a/slice2java/cpp/test/DataStorm/events/Test/Extended.java
+++ b/slice2java/cpp/test/DataStorm/events/Test/Extended.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2516995023265520621L;
+    private static final long serialVersionUID = 2516995003963030919L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/events/Test/StructValue.java b/slice2java/cpp/test/DataStorm/events/Test/StructValue.java
index d16347d7e31b..347f42035781 100644
--- a/slice2java/cpp/test/DataStorm/events/Test/StructValue.java
+++ b/slice2java/cpp/test/DataStorm/events/Test/StructValue.java
@@ -167,5 +167,5 @@ static public java.util.Optional<StructValue> ice_read(com.zeroc.Ice.InputStream
     private static final StructValue _nullMarshalValue = new StructValue();
 
     /** @hidden */
-    private static final long serialVersionUID = 5230327014055813642L;
+    private static final long serialVersionUID = 5966103384457064032L;
 }
diff --git a/slice2java/cpp/test/DataStorm/partial/Test/Stock.java b/slice2java/cpp/test/DataStorm/partial/Test/Stock.java
index 8f33ec2fc9fc..70f62fc08c00 100644
--- a/slice2java/cpp/test/DataStorm/partial/Test/Stock.java
+++ b/slice2java/cpp/test/DataStorm/partial/Test/Stock.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7826623833539603789L;
+    private static final long serialVersionUID = -3065571260803334584L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/types/Test/Base.java b/slice2java/cpp/test/DataStorm/types/Test/Base.java
index 5c610f9c9cd5..52ed3355a963 100644
--- a/slice2java/cpp/test/DataStorm/types/Test/Base.java
+++ b/slice2java/cpp/test/DataStorm/types/Test/Base.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2623892840535751090L;
+    private static final long serialVersionUID = -2623895068235260707L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/types/Test/Extended.java b/slice2java/cpp/test/DataStorm/types/Test/Extended.java
index 3534e41472fa..287d0771cb16 100644
--- a/slice2java/cpp/test/DataStorm/types/Test/Extended.java
+++ b/slice2java/cpp/test/DataStorm/types/Test/Extended.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2516992872880747500L;
+    private static final long serialVersionUID = 2516994932863054507L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/types/Test/StructValue.java b/slice2java/cpp/test/DataStorm/types/Test/StructValue.java
index 28be9bec4045..bf86c148088d 100644
--- a/slice2java/cpp/test/DataStorm/types/Test/StructValue.java
+++ b/slice2java/cpp/test/DataStorm/types/Test/StructValue.java
@@ -167,5 +167,5 @@ static public java.util.Optional<StructValue> ice_read(com.zeroc.Ice.InputStream
     private static final StructValue _nullMarshalValue = new StructValue();
 
     /** @hidden */
-    private static final long serialVersionUID = 1982824498244188555L;
+    private static final long serialVersionUID = 3784525578987128396L;
 }
diff --git a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java
index 5ae5e39275b7..1fa60bde4479 100644
--- a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java
+++ b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java
@@ -201,5 +201,5 @@ static public java.util.Optional<TestToken> ice_read(com.zeroc.Ice.InputStream i
     private static final TestToken _nullMarshalValue = new TestToken();
 
     /** @hidden */
-    private static final long serialVersionUID = -1217700668911708353L;
+    private static final long serialVersionUID = 2263403728128888532L;
 }
diff --git a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java
index 1d72028f0249..5b9def7e70bc 100644
--- a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java
@@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8515455163425064628L;
+    private static final long serialVersionUID = 1430029665556325836L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java
index 15450df7ae52..5f1c82f74b7a 100644
--- a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java
+++ b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java
@@ -199,5 +199,5 @@ static public java.util.Optional<BufferStruct> ice_read(com.zeroc.Ice.InputStrea
     private static final BufferStruct _nullMarshalValue = new BufferStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 247469907537341733L;
+    private static final long serialVersionUID = -8154724363304812125L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/DictClass.java b/slice2java/cpp/test/Ice/custom/Test/DictClass.java
index 8354f2a13c24..b940ba283e58 100644
--- a/slice2java/cpp/test/Ice/custom/Test/DictClass.java
+++ b/slice2java/cpp/test/Ice/custom/Test/DictClass.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6545913851318869194L;
+    private static final long serialVersionUID = 6545913877072506560L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/custom/Test/Fixed.java b/slice2java/cpp/test/Ice/custom/Test/Fixed.java
index 758678017dd7..83462dd1ea89 100644
--- a/slice2java/cpp/test/Ice/custom/Test/Fixed.java
+++ b/slice2java/cpp/test/Ice/custom/Test/Fixed.java
@@ -138,5 +138,5 @@ static public java.util.Optional<Fixed> ice_read(com.zeroc.Ice.InputStream istr,
     private static final Fixed _nullMarshalValue = new Fixed();
 
     /** @hidden */
-    private static final long serialVersionUID = -5072328242009876844L;
+    private static final long serialVersionUID = -5072328260090620975L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/Variable.java b/slice2java/cpp/test/Ice/custom/Test/Variable.java
index 93f242fc9a9f..9b1ce044c910 100644
--- a/slice2java/cpp/test/Ice/custom/Test/Variable.java
+++ b/slice2java/cpp/test/Ice/custom/Test/Variable.java
@@ -163,5 +163,5 @@ static public java.util.Optional<Variable> ice_read(com.zeroc.Ice.InputStream is
     private static final Variable _nullMarshalValue = new Variable();
 
     /** @hidden */
-    private static final long serialVersionUID = -7431594452828151733L;
+    private static final long serialVersionUID = 3345069113946277277L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java
index 7a3d1ef1eada..62a910c39db0 100644
--- a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java
+++ b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1345711928452388796L;
+    private static final long serialVersionUID = 1345710672986417201L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java
index 4a27b63c5223..0af9a5c0473e 100644
--- a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java
+++ b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<WstringStruct> ice_read(com.zeroc.Ice.InputStre
     private static final WstringStruct _nullMarshalValue = new WstringStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -6616024592232397781L;
+    private static final long serialVersionUID = -6616023171477360474L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java
index 82dead05e8ad..8f084d611c97 100644
--- a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java
+++ b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4583031133844814207L;
+    private static final long serialVersionUID = 4583043260726479090L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java
index 1bbc0bb4feab..041e98f6627e 100644
--- a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java
+++ b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<WstringStruct> ice_read(com.zeroc.Ice.InputStre
     private static final WstringStruct _nullMarshalValue = new WstringStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 5997333601342914024L;
+    private static final long serialVersionUID = 5997321309134236005L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java
index 33af241e2a76..fe2cfb9ab81e 100644
--- a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java
+++ b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java
@@ -106,7 +106,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -259906980951009641L;
+    private static final long serialVersionUID = -6115932073325250985L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java
index af1dcde5bb37..2cbee0158f1c 100644
--- a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -512127809563023965L;
+    private static final long serialVersionUID = 8608805114834530147L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java
index db49d26bd32c..6ce92ab4d5a7 100644
--- a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java
+++ b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java
@@ -68,7 +68,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9097544763010696903L;
+    private static final long serialVersionUID = 7701894655994977785L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java
index 5daf23d267af..4f5b88d8f7a7 100644
--- a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java
@@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3283549262228275342L;
+    private static final long serialVersionUID = -6913973302661808434L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java
index 289a861f46bb..bbd279e7cab1 100644
--- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java
+++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct1> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct1 _nullMarshalValue = new Struct1();
 
     /** @hidden */
-    private static final long serialVersionUID = -861860845331230994L;
+    private static final long serialVersionUID = -5541617956848905810L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java
index 98e248fe424d..0b8f26406220 100644
--- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java
+++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java
@@ -370,5 +370,5 @@ static public java.util.Optional<Struct2> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct2 _nullMarshalValue = new Struct2();
 
     /** @hidden */
-    private static final long serialVersionUID = 8697185987581821322L;
+    private static final long serialVersionUID = 3077649844621724938L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java
index 36c7422570b9..c52875715cfd 100644
--- a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java
+++ b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct3> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct3 _nullMarshalValue = new Struct3();
 
     /** @hidden */
-    private static final long serialVersionUID = -8844654801437736468L;
+    private static final long serialVersionUID = -4685131638959212372L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/A.java b/slice2java/cpp/test/Ice/exceptions/Test/A.java
index ac45ba56b145..7505e652934e 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/A.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823746667682364995L;
+    private static final long serialVersionUID = 7823744440130180550L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/B.java b/slice2java/cpp/test/Ice/exceptions/Test/B.java
index dbc3dfb38246..e56ee97c939c 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/B.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861409230677852797L;
+    private static final long serialVersionUID = -3861405838065031930L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/C.java b/slice2java/cpp/test/Ice/exceptions/Test/C.java
index 40dd2b57ebaa..82c1b605f8a2 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/C.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080700358885150275L;
+    private static final long serialVersionUID = 1080698131332965830L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/D.java b/slice2java/cpp/test/Ice/exceptions/Test/D.java
index 616f5eee583e..8424910dda6c 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/D.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780383037424225411L;
+    private static final long serialVersionUID = 4780386430037046278L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/E.java b/slice2java/cpp/test/Ice/exceptions/Test/E.java
index a5bd9d5d055b..d15e29e794b1 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/E.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/E.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1876971999357848851L;
+    private static final long serialVersionUID = -1876975544361668504L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/F.java b/slice2java/cpp/test/Ice/exceptions/Test/F.java
index 20dec307cfc2..fa48a8cab125 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/F.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/F.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 733479825690570158L;
+    private static final long serialVersionUID = 733476107782127915L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java
index 4a09cfd13451..dd8f1a350f50 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641412517930520105L;
+    private static final long serialVersionUID = -4641415747661831086L;
 }
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java
index fc44604e2309..f7440e3bdf80 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 954223471335217674L;
+    private static final long serialVersionUID = 954227963092615037L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java
index af43dc474316..15926e7de8e8 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1339631317617791760L;
+    private static final long serialVersionUID = 1339637000178016999L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java
index bf527e4eb150..51f3857371af 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2729314423995446894L;
+    private static final long serialVersionUID = -2729308570952537371L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java
index fa834564e55a..2be63fdf4d23 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MC/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3435400861990988524L;
+    private static final long serialVersionUID = -3435405769449691933L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java
index 889f203824ad..f5bda9b202f3 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -836178988969189875L;
+    private static final long serialVersionUID = -836179717458277190L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java
index 4a6f7cdb4ff1..59d1d581d833 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1132525570118615856L;
+    private static final long serialVersionUID = 1132531583304119687L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java
index 9c8f6b50236b..fd2ca912cd94 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6335557811639390030L;
+    private static final long serialVersionUID = -6335551627989601659L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java
index d7ba22e27009..61842e340fd6 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MD/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4007407113108704204L;
+    private static final long serialVersionUID = -4007411689942129021L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java b/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java
index 9c644eaeca85..a2ec37454203 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 991428054622686604L;
+    private static final long serialVersionUID = 991421785878471035L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java b/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java
index 56803fcebc84..145d1782862e 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2880342249680760368L;
+    private static final long serialVersionUID = -2880330781638151385L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java b/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java
index 0fbe0de54d1b..3174f142f371 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8808270296356820398L;
+    private static final long serialVersionUID = -8808269568171328987L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java b/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java
index fbc9d80b40b1..e7b5d82cace4 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/ME/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -771861228732095276L;
+    private static final long serialVersionUID = -771860350708414941L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java
index 5cc0bebb0bbc..31ac7454593b 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6566362187191403919L;
+    private static final long serialVersionUID = 6566350718845199032L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java
index 669467989c2e..53dd7e7982cb 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6983796864782827504L;
+    private static final long serialVersionUID = 6983808333119832519L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java
index 669166464019..19d197a762e6 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1175216701026667918L;
+    private static final long serialVersionUID = -1175215972528380731L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java
index a00cdc1d6b95..3e712872c237 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MF/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3279721031461469196L;
+    private static final long serialVersionUID = -3279720153143392829L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java
index 7d93ff154a68..7a0a969a7321 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4359177939066580466L;
+    private static final long serialVersionUID = -4359184037328111751L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java
index d84642a93530..c4b154d2e614 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5904688105169179792L;
+    private static final long serialVersionUID = 5904693787729405031L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java
index 802538149694..f8d995cfa5ac 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1835742363555941138L;
+    private static final long serialVersionUID = 1835748216598850661L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java
index 470675245611..bdaf4be246a6 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MG/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2252401515221305708L;
+    private static final long serialVersionUID = -2252406422680009117L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java
index 7fccb0961208..1d8fd9250422 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1203537421613940735L;
+    private static final long serialVersionUID = -1203527560084099402L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java b/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java
index 4c93581caf77..16ddecbe7663 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7537766461468669264L;
+    private static final long serialVersionUID = -7537760448283165433L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java b/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java
index 40c666962fb9..be407e3deb78 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3440894230482876466L;
+    private static final long serialVersionUID = 3440900414132664837L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java b/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java
index c6cfcd072142..7159e5b2d423 100644
--- a/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java
+++ b/slice2java/cpp/test/Ice/inheritance/Test/MH/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9151102369795267508L;
+    private static final long serialVersionUID = 9151097792961842691L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/library/Test/UserError.java b/slice2java/cpp/test/Ice/library/Test/UserError.java
index e9c6ff5a3754..93fb024d04a6 100644
--- a/slice2java/cpp/test/Ice/library/Test/UserError.java
+++ b/slice2java/cpp/test/Ice/library/Test/UserError.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126956567244736602L;
+    private static final long serialVersionUID = -1126956267621148518L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/A.java b/slice2java/cpp/test/Ice/objects/Test/A.java
index f52f2d8df34e..163e92ac1c40 100644
--- a/slice2java/cpp/test/Ice/objects/Test/A.java
+++ b/slice2java/cpp/test/Ice/objects/Test/A.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7646140441167917535L;
+    private static final long serialVersionUID = 3010353119071158340L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/A1.java b/slice2java/cpp/test/Ice/objects/Test/A1.java
index 7bf321946f07..0ecfe0cd9e77 100644
--- a/slice2java/cpp/test/Ice/objects/Test/A1.java
+++ b/slice2java/cpp/test/Ice/objects/Test/A1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5926742195801387171L;
+    private static final long serialVersionUID = -5926743456258173317L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/B.java b/slice2java/cpp/test/Ice/objects/Test/B.java
index a3acf81b26ee..dd9550441d82 100644
--- a/slice2java/cpp/test/Ice/objects/Test/B.java
+++ b/slice2java/cpp/test/Ice/objects/Test/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8890920021668743206L;
+    private static final long serialVersionUID = -8890910328006823238L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/B1.java b/slice2java/cpp/test/Ice/objects/Test/B1.java
index 96315d418154..814ffe743f6c 100644
--- a/slice2java/cpp/test/Ice/objects/Test/B1.java
+++ b/slice2java/cpp/test/Ice/objects/Test/B1.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3444591754650356740L;
+    private static final long serialVersionUID = -7577324399990797692L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Base.java b/slice2java/cpp/test/Ice/objects/Test/Base.java
index 497ac70037a3..2ac77e3bacfc 100644
--- a/slice2java/cpp/test/Ice/objects/Test/Base.java
+++ b/slice2java/cpp/test/Ice/objects/Test/Base.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3551267476562788156L;
+    private static final long serialVersionUID = -6407330590607755396L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java
index f898f796c9ac..192fb8eafeb2 100644
--- a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java
+++ b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3897767674357821199L;
+    private static final long serialVersionUID = 3897771742649914793L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/C.java b/slice2java/cpp/test/Ice/objects/Test/C.java
index 0d5e8232ecfb..b137f274e1af 100644
--- a/slice2java/cpp/test/Ice/objects/Test/C.java
+++ b/slice2java/cpp/test/Ice/objects/Test/C.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2764832590069696728L;
+    private static final long serialVersionUID = -1644208934808614187L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/COneMember.java b/slice2java/cpp/test/Ice/objects/Test/COneMember.java
index a9f6e5c33430..0015049020f4 100644
--- a/slice2java/cpp/test/Ice/objects/Test/COneMember.java
+++ b/slice2java/cpp/test/Ice/objects/Test/COneMember.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3050973086826144931L;
+    private static final long serialVersionUID = 3050969018551806576L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java
index 18a2ebef8830..cb82e3bceb0b 100644
--- a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java
+++ b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6995239897695015451L;
+    private static final long serialVersionUID = -1948942432044271461L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/D.java b/slice2java/cpp/test/Ice/objects/Test/D.java
index 0a6c9bb5c18d..88063e13ada5 100644
--- a/slice2java/cpp/test/Ice/objects/Test/D.java
+++ b/slice2java/cpp/test/Ice/objects/Test/D.java
@@ -57,7 +57,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2934798826502178783L;
+    private static final long serialVersionUID = 4222624298145309402L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/D1.java b/slice2java/cpp/test/Ice/objects/Test/D1.java
index d29be79264ad..8dbab8620a69 100644
--- a/slice2java/cpp/test/Ice/objects/Test/D1.java
+++ b/slice2java/cpp/test/Ice/objects/Test/D1.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5983196161691101245L;
+    private static final long serialVersionUID = 6374855317718017347L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Derived.java b/slice2java/cpp/test/Ice/objects/Test/Derived.java
index e0c4b6e36fc6..0f523557d1af 100644
--- a/slice2java/cpp/test/Ice/objects/Test/Derived.java
+++ b/slice2java/cpp/test/Ice/objects/Test/Derived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1587930529586112746L;
+    private static final long serialVersionUID = -1587923930179896545L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/E.java b/slice2java/cpp/test/Ice/objects/Test/E.java
index 2719895fbd3c..daa53ad8211e 100644
--- a/slice2java/cpp/test/Ice/objects/Test/E.java
+++ b/slice2java/cpp/test/Ice/objects/Test/E.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3072555958854217596L;
+    private static final long serialVersionUID = 5357558537681128362L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/EBase.java b/slice2java/cpp/test/Ice/objects/Test/EBase.java
index 57ebd3a03047..c09a7515e780 100644
--- a/slice2java/cpp/test/Ice/objects/Test/EBase.java
+++ b/slice2java/cpp/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4111160628667765454L;
+    private static final long serialVersionUID = -7103567428316974002L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/EDerived.java b/slice2java/cpp/test/Ice/objects/Test/EDerived.java
index 9bc8ea95d266..e145d4d53b64 100644
--- a/slice2java/cpp/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/cpp/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8689202836196069202L;
+    private static final long serialVersionUID = 2248111588955176402L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java
index 7ad64f3461ba..be9aa00cfc83 100644
--- a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225288230308464404L;
+    private static final long serialVersionUID = -6225284200935752001L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java
index fad008426ca5..4506537f5c44 100644
--- a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8855724959756679276L;
+    private static final long serialVersionUID = -2859500621345989612L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/F.java b/slice2java/cpp/test/Ice/objects/Test/F.java
index 3c73b1f8c89a..b3be5aa06ab9 100644
--- a/slice2java/cpp/test/Ice/objects/Test/F.java
+++ b/slice2java/cpp/test/Ice/objects/Test/F.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3277042234486966225L;
+    private static final long serialVersionUID = 5379212719041650193L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/F1.java b/slice2java/cpp/test/Ice/objects/Test/F1.java
index fcc52d38729d..40a670f30649 100644
--- a/slice2java/cpp/test/Ice/objects/Test/F1.java
+++ b/slice2java/cpp/test/Ice/objects/Test/F1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6192369376588281678L;
+    private static final long serialVersionUID = 6192372022889016457L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/F3.java b/slice2java/cpp/test/Ice/objects/Test/F3.java
index af3b0f8c5c94..09493e46bc17 100644
--- a/slice2java/cpp/test/Ice/objects/Test/F3.java
+++ b/slice2java/cpp/test/Ice/objects/Test/F3.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7820918275280802759L;
+    private static final long serialVersionUID = -6189915722043966950L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Inner/A.java b/slice2java/cpp/test/Ice/objects/Test/Inner/A.java
index e267c183770e..0867141a8a72 100644
--- a/slice2java/cpp/test/Ice/objects/Test/Inner/A.java
+++ b/slice2java/cpp/test/Ice/objects/Test/Inner/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1425257188545092368L;
+    private static final long serialVersionUID = -1425258410209161136L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java b/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java
index ef6095f6a02c..8f73625da82b 100644
--- a/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337227993490594332L;
+    private static final long serialVersionUID = -2337226572721560766L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java
index 994469d6053e..f53aba42488c 100644
--- a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java
+++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1298680552181185677L;
+    private static final long serialVersionUID = -1298687389275819702L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java
index ec165b9797c1..90cd0bbdf695 100644
--- a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842234175938080384L;
+    private static final long serialVersionUID = 1842230146541791206L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/K.java b/slice2java/cpp/test/Ice/objects/Test/K.java
index df7b2fb01204..9ee9031064fd 100644
--- a/slice2java/cpp/test/Ice/objects/Test/K.java
+++ b/slice2java/cpp/test/Ice/objects/Test/K.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4645163276186215249L;
+    private static final long serialVersionUID = 4645159241873314950L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/L.java b/slice2java/cpp/test/Ice/objects/Test/L.java
index 068ad1b9cb8b..d3f3e3b0365f 100644
--- a/slice2java/cpp/test/Ice/objects/Test/L.java
+++ b/slice2java/cpp/test/Ice/objects/Test/L.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6629735031527146006L;
+    private static final long serialVersionUID = 6629747328726220528L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/M.java b/slice2java/cpp/test/Ice/objects/Test/M.java
index 6dcffa0ad845..d6183d9b2f4e 100644
--- a/slice2java/cpp/test/Ice/objects/Test/M.java
+++ b/slice2java/cpp/test/Ice/objects/Test/M.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8088093154471959447L;
+    private static final long serialVersionUID = -8088105490653942882L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Recursive.java b/slice2java/cpp/test/Ice/objects/Test/Recursive.java
index 6853eca0114a..e69ca3dbaa5b 100644
--- a/slice2java/cpp/test/Ice/objects/Test/Recursive.java
+++ b/slice2java/cpp/test/Ice/objects/Test/Recursive.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3617879040991869966L;
+    private static final long serialVersionUID = 3617885916989947228L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/S.java b/slice2java/cpp/test/Ice/objects/Test/S.java
index c718f1a68d1a..7392eabf7e15 100644
--- a/slice2java/cpp/test/Ice/objects/Test/S.java
+++ b/slice2java/cpp/test/Ice/objects/Test/S.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 481770330221190309L;
+    private static final long serialVersionUID = 481774568807514819L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java
index 5d94df8ce48c..42a3279cce84 100644
--- a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java
+++ b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java
@@ -142,5 +142,5 @@ static public java.util.Optional<SOneMember> ice_read(com.zeroc.Ice.InputStream
     private static final SOneMember _nullMarshalValue = new SOneMember();
 
     /** @hidden */
-    private static final long serialVersionUID = 6227757431816969850L;
+    private static final long serialVersionUID = 6227745134618400553L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java
index 576c6d7bdc07..6f8c66c5031f 100644
--- a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java
+++ b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java
@@ -155,5 +155,5 @@ static public java.util.Optional<STwoMembers> ice_read(com.zeroc.Ice.InputStream
     private static final STwoMembers _nullMarshalValue = new STwoMembers();
 
     /** @hidden */
-    private static final long serialVersionUID = -3290108927832884478L;
+    private static final long serialVersionUID = 3212630502035446914L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/StructKey.java b/slice2java/cpp/test/Ice/objects/Test/StructKey.java
index 55b288bc1619..1ef9af19f977 100644
--- a/slice2java/cpp/test/Ice/objects/Test/StructKey.java
+++ b/slice2java/cpp/test/Ice/objects/Test/StructKey.java
@@ -153,5 +153,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = 8692775254211231176L;
+    private static final long serialVersionUID = -7588391917427896858L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java
index d27ee29fcc14..167f8f3a98f8 100644
--- a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java
+++ b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<AnotherStruct> ice_read(com.zeroc.Ice.InputStre
     private static final AnotherStruct _nullMarshalValue = new AnotherStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2723841518563343234L;
+    private static final long serialVersionUID = 2723850256635513750L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java
index 4788c5d58c4c..f3e0d60f8a54 100644
--- a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java
+++ b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1330631198151028927L;
+    private static final long serialVersionUID = 7040580691910874382L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java
index 9ca364289432..b4788b6dc6d9 100644
--- a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java
+++ b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java
@@ -148,5 +148,5 @@ static public java.util.Optional<MyStruct> ice_read(com.zeroc.Ice.InputStream is
     private static final MyStruct _nullMarshalValue = new MyStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -451135953093700131L;
+    private static final long serialVersionUID = 3124026213617564317L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java
index 7067ca5182e7..1e9c2f4ac24d 100644
--- a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java
+++ b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java
@@ -170,5 +170,5 @@ static public java.util.Optional<MyStruct1> ice_read(com.zeroc.Ice.InputStream i
     private static final MyStruct1 _nullMarshalValue = new MyStruct1();
 
     /** @hidden */
-    private static final long serialVersionUID = 3649770297779166632L;
+    private static final long serialVersionUID = -382754108897803193L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/Structure.java b/slice2java/cpp/test/Ice/operations/Test/Structure.java
index eee4f3ce0229..2a095df6346e 100644
--- a/slice2java/cpp/test/Ice/operations/Test/Structure.java
+++ b/slice2java/cpp/test/Ice/operations/Test/Structure.java
@@ -170,5 +170,5 @@ static public java.util.Optional<Structure> ice_read(com.zeroc.Ice.InputStream i
     private static final Structure _nullMarshalValue = new Structure();
 
     /** @hidden */
-    private static final long serialVersionUID = -5610120707907466321L;
+    private static final long serialVersionUID = 2677677276350077299L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/A.java b/slice2java/cpp/test/Ice/optional/Test/A.java
index f682127db9c8..deccbdec4ff2 100644
--- a/slice2java/cpp/test/Ice/optional/Test/A.java
+++ b/slice2java/cpp/test/Ice/optional/Test/A.java
@@ -213,7 +213,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1956393632408328336L;
+    private static final long serialVersionUID = -5823558272980460144L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/B.java b/slice2java/cpp/test/Ice/optional/Test/B.java
index 07722644f169..7f681b3b1420 100644
--- a/slice2java/cpp/test/Ice/optional/Test/B.java
+++ b/slice2java/cpp/test/Ice/optional/Test/B.java
@@ -108,7 +108,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6819831814712576221L;
+    private static final long serialVersionUID = 3535764771543646371L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/C.java b/slice2java/cpp/test/Ice/optional/Test/C.java
index 307744195f18..03dd0ee18806 100644
--- a/slice2java/cpp/test/Ice/optional/Test/C.java
+++ b/slice2java/cpp/test/Ice/optional/Test/C.java
@@ -110,7 +110,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1940111804855832835L;
+    private static final long serialVersionUID = -7477421852282676035L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java
index bb9ad7b71b5c..dff96640b154 100644
--- a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6421947884284807538L;
+    private static final long serialVersionUID = -1187100598432019418L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/E.java b/slice2java/cpp/test/Ice/optional/Test/E.java
index ccc003babcb5..7e556224d901 100644
--- a/slice2java/cpp/test/Ice/optional/Test/E.java
+++ b/slice2java/cpp/test/Ice/optional/Test/E.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1850731331731361487L;
+    private static final long serialVersionUID = -1850739245750301471L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/F.java b/slice2java/cpp/test/Ice/optional/Test/F.java
index a08f9596c319..f6d4d066289f 100644
--- a/slice2java/cpp/test/Ice/optional/Test/F.java
+++ b/slice2java/cpp/test/Ice/optional/Test/F.java
@@ -105,7 +105,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6430490043119366846L;
+    private static final long serialVersionUID = -6430492719123406574L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java
index 803d855bcf93..6f4ce179f2e5 100644
--- a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java
+++ b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<FixedStruct> ice_read(com.zeroc.Ice.InputStream
     private static final FixedStruct _nullMarshalValue = new FixedStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 1569609617442277718L;
+    private static final long serialVersionUID = 1569601411464583954L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/G.java b/slice2java/cpp/test/Ice/optional/Test/G.java
index 21440868662d..b59b7df0c813 100644
--- a/slice2java/cpp/test/Ice/optional/Test/G.java
+++ b/slice2java/cpp/test/Ice/optional/Test/G.java
@@ -168,7 +168,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1784797198584437421L;
+    private static final long serialVersionUID = 64256408302942419L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/G1.java b/slice2java/cpp/test/Ice/optional/Test/G1.java
index 805b890a506d..0ad7d4bf7a0d 100644
--- a/slice2java/cpp/test/Ice/optional/Test/G1.java
+++ b/slice2java/cpp/test/Ice/optional/Test/G1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<G1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G1 _nullMarshalValue = new G1();
 
     /** @hidden */
-    private static final long serialVersionUID = 7339787280667112192L;
+    private static final long serialVersionUID = 7339784731264417640L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/G2.java b/slice2java/cpp/test/Ice/optional/Test/G2.java
index 0012b959e1fc..ccf8dc579a36 100644
--- a/slice2java/cpp/test/Ice/optional/Test/G2.java
+++ b/slice2java/cpp/test/Ice/optional/Test/G2.java
@@ -138,5 +138,5 @@ static public java.util.Optional<G2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G2 _nullMarshalValue = new G2();
 
     /** @hidden */
-    private static final long serialVersionUID = 3824559281604919590L;
+    private static final long serialVersionUID = 3824551367586596556L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java
index 1a91ae90fcff..1d4066846c37 100644
--- a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java
+++ b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java
@@ -1675,7 +1675,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1527146461049973353L;
+    private static final long serialVersionUID = 480063269692036185L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java
index 3379f371ddc4..a0a85a2e8b40 100644
--- a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java
+++ b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java
@@ -96,7 +96,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7219607335716857352L;
+    private static final long serialVersionUID = -7219599170922390852L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java
index 52cbd78a2dad..d3bf38c3a225 100644
--- a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5159916143626046619L;
+    private static final long serialVersionUID = -8997131492688680018L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java
index 4f1a26245a1e..6f5c226b9d13 100644
--- a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java
+++ b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java
@@ -186,7 +186,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9149753751128700475L;
+    private static final long serialVersionUID = 5302772283115806395L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java
index a8c963c89078..5bf75fd47837 100644
--- a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894241381622813769L;
+    private static final long serialVersionUID = 2894238752141702881L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java
index 44b89205adee..6ab6a4344f06 100644
--- a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java
+++ b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<SmallStruct> ice_read(com.zeroc.Ice.InputStream
     private static final SmallStruct _nullMarshalValue = new SmallStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 6700995985623814655L;
+    private static final long serialVersionUID = 6700987859765119710L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java
index e129c4fcd99b..b48445b73064 100644
--- a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java
+++ b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<VarStruct> ice_read(com.zeroc.Ice.InputStream i
     private static final VarStruct _nullMarshalValue = new VarStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -1912281586916475256L;
+    private static final long serialVersionUID = -1912284136319743776L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/WD.java b/slice2java/cpp/test/Ice/optional/Test/WD.java
index 2397494d9166..fc8fc9f72b70 100644
--- a/slice2java/cpp/test/Ice/optional/Test/WD.java
+++ b/slice2java/cpp/test/Ice/optional/Test/WD.java
@@ -152,7 +152,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7064791123301991096L;
+    private static final long serialVersionUID = 207141583584245716L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C.java b/slice2java/cpp/test/Ice/scope/Test/C.java
index 92b5b4af4a32..e9656bd256d2 100644
--- a/slice2java/cpp/test/Ice/scope/Test/C.java
+++ b/slice2java/cpp/test/Ice/scope/Test/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5190252056201637547L;
+    private static final long serialVersionUID = -5190249916178049816L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C1.java b/slice2java/cpp/test/Ice/scope/Test/C1.java
index 144bb3c54646..2d493e5d5069 100644
--- a/slice2java/cpp/test/Ice/scope/Test/C1.java
+++ b/slice2java/cpp/test/Ice/scope/Test/C1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8893237963780315213L;
+    private static final long serialVersionUID = 8893230730026871145L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C2.java b/slice2java/cpp/test/Ice/scope/Test/C2.java
index bc6c9a881c47..04901f2187c2 100644
--- a/slice2java/cpp/test/Ice/scope/Test/C2.java
+++ b/slice2java/cpp/test/Ice/scope/Test/C2.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7094667722566624533L;
+    private static final long serialVersionUID = -4056808249532326296L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/C.java b/slice2java/cpp/test/Ice/scope/Test/Inner/C.java
index e3cdfb95fe25..a12f629bf3b8 100644
--- a/slice2java/cpp/test/Ice/scope/Test/Inner/C.java
+++ b/slice2java/cpp/test/Ice/scope/Test/Inner/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4615624896015952619L;
+    private static final long serialVersionUID = 4615625318304161008L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java
index 74074e4a379d..b80cea55fdc9 100644
--- a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java
+++ b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 672596194703292119L;
+    private static final long serialVersionUID = 672580943581994100L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java
index 0a641f802edb..a709085535ca 100644
--- a/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java
+++ b/slice2java/cpp/test/Ice/scope/Test/Inner/Inner2/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 8654434670926871526L;
+    private static final long serialVersionUID = 8654441904529298828L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java
index c151bed77780..50c4c9ef9418 100644
--- a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java
+++ b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 3694622107782143786L;
+    private static final long serialVersionUID = 3694613337488505792L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S.java b/slice2java/cpp/test/Ice/scope/Test/S.java
index ce16224c1f92..03e985966342 100644
--- a/slice2java/cpp/test/Ice/scope/Test/S.java
+++ b/slice2java/cpp/test/Ice/scope/Test/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 2159704797252004500L;
+    private static final long serialVersionUID = 2159705219494321342L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S1.java b/slice2java/cpp/test/Ice/scope/Test/S1.java
index 1db1d7dc8c2f..54142ccaaf41 100644
--- a/slice2java/cpp/test/Ice/scope/Test/S1.java
+++ b/slice2java/cpp/test/Ice/scope/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = 1241675431531428852L;
+    private static final long serialVersionUID = 1241671770299949136L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S2.java b/slice2java/cpp/test/Ice/scope/Test/S2.java
index 770943739f90..4c637ff32576 100644
--- a/slice2java/cpp/test/Ice/scope/Test/S2.java
+++ b/slice2java/cpp/test/Ice/scope/Test/S2.java
@@ -170,5 +170,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = 7224519676310716780L;
+    private static final long serialVersionUID = 5918336959472461585L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java
index 39a975c568dc..6d1af66918c3 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477021394792302641L;
+    private static final long serialVersionUID = -477020453250892252L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 160278df5cf4..500eb9edba25 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485211380805856361L;
+    private static final long serialVersionUID = 3485217937659762242L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 1e49811329f2..8e0e9e83b950 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717374825696865432L;
+    private static final long serialVersionUID = 1717374566030993843L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index c76e0fbc9d2c..75264dc8bf25 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384920922665194559L;
+    private static final long serialVersionUID = -7384915047686827734L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index 442ff6d2fccf..5e24886f5c32 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424370096954217729L;
+    private static final long serialVersionUID = 3424372244762300974L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 12535c1b777c..7e539837bb5b 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172598399458840368L;
+    private static final long serialVersionUID = -1172605997233866817L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index cf133f5fae50..83453278dbf7 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126114010266664279L;
+    private static final long serialVersionUID = -1126117312633385914L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index a5f06738b127..dc0bdfd34a81 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097583640444501239L;
+    private static final long serialVersionUID = -2097581492655391706L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java
index 030f2476efdd..bc027645420f 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6092927475320796695L;
+    private static final long serialVersionUID = -6959729108010538022L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java
index cef79a3aacf4..3f49d44eb8d4 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6831686444254000549L;
+    private static final long serialVersionUID = 5514690101364227350L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 8a9dcd9e37a1..3b8ab150b8dc 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6397001291706011089L;
+    private static final long serialVersionUID = -6396997786500518517L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java
index 599a8caaf357..956e2e17d169 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9066884612328605221L;
+    private static final long serialVersionUID = -9066880639779572544L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java b/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java
index 89495a520a14..10f809ea7c8a 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D1.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2831608755203117654L;
+    private static final long serialVersionUID = -3122898496413280743L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java b/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java
index 0a7571de522f..2e55fd29f62c 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D2.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1703089244721538448L;
+    private static final long serialVersionUID = 1704313911812364336L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java b/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java
index dfd2b2d89306..1f5f445192ad 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D3.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4529019499025630127L;
+    private static final long serialVersionUID = 122083938591779089L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java b/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java
index a5b2fa526e78..68800a84ac7e 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/D4.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1551412180204456461L;
+    private static final long serialVersionUID = -8572969888091491213L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java
index f77c420302cc..3cabb3a72b8c 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1402759304840613846L;
+    private static final long serialVersionUID = 5895707107556648341L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java
index a5d8204acada..8999b7bb1860 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7655930382690387198L;
+    private static final long serialVersionUID = -7655923765494589920L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java
index 9ede2f7f44a7..5cfcc0bdad7c 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Hidden.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2271121477174100612L;
+    private static final long serialVersionUID = -2271128094650981986L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java b/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java
index 03fc82df08a0..ccc2bd77dcf3 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/MyClass.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4147529200451302172L;
+    private static final long serialVersionUID = 4147520611010474086L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java
index f1aa3e6943d9..965523dac65f 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PBase.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 481709538497705388L;
+    private static final long serialVersionUID = 481713831266987310L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java
index ee7d06780caa..01802701f67f 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4426881028679665425L;
+    private static final long serialVersionUID = -4426882813630569653L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java
index ce93479f8146..ce7b9a4e8ac6 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 850537863901158454L;
+    private static final long serialVersionUID = 850539813865993810L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java
index 0432562e71cc..f246ae3b40d3 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCDerived3.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4328906001910142617L;
+    private static final long serialVersionUID = -4328908354675125629L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java
index 3e614bbe4bb2..7c89de68b7c1 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PCUnknown.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5081802934490094361L;
+    private static final long serialVersionUID = -5081806284714260093L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java
index bfc7be86cc2a..9c9eb55f16b7 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 643089569386506844L;
+    private static final long serialVersionUID = 643085596833940167L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java
index 61aedd4fb2c2..2b78dac0043e 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PNode.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2437998854063473904L;
+    private static final long serialVersionUID = -2438013736919802426L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java
index 78f117f22f5a..4a0bd453fe6f 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8431924120216059536L;
+    private static final long serialVersionUID = 6960414040464375658L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java
index 8c820e12142d..29ae60d1eba7 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/PSUnknown2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8813709907219667202L;
+    private static final long serialVersionUID = -8813712315615815100L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java
index 94e3dbe958d9..1fc5abff947c 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/Preserved.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3651535956239527210L;
+    private static final long serialVersionUID = 3651529338750190688L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java
index 0ce3cb347473..d89805da8668 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSKnownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8804375773311461135L;
+    private static final long serialVersionUID = 8804382390780704709L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java
index e941265c59bf..a1bba97e2038 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4989066900195025162L;
+    private static final long serialVersionUID = -4989058997602873588L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java
index b9ea2b703b5e..dff52f6a6683 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SBase.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5353757829629509575L;
+    private static final long serialVersionUID = -5353761802186865549L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java
index 7806b0929fe9..6b6f6a2abb94 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6522143821413698941L;
+    private static final long serialVersionUID = -6522139848804587595L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java
index caff39e79d71..3953c4d2afca 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS2.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7620281290569512192L;
+    private static final long serialVersionUID = 7620287907955526390L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java
index 6ae621886fff..dca61c6ecca7 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SS3.java
@@ -155,5 +155,5 @@ static public java.util.Optional<SS3> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final SS3 _nullMarshalValue = new SS3();
 
     /** @hidden */
-    private static final long serialVersionUID = -8638644567805126382L;
+    private static final long serialVersionUID = -3690202859269646316L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java
index 122ed01a9f07..51d8f48c4538 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3445743538034942393L;
+    private static final long serialVersionUID = -1565765694919902713L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java b/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
index 37d75a5290d4..0f368353ebf6 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2392729921541128805L;
+    private static final long serialVersionUID = -7618349333494024155L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java
index 45f15fb403a4..bed0447d80f0 100644
--- a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java
+++ b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<ClassStruct> ice_read(com.zeroc.Ice.InputStream
     private static final ClassStruct _nullMarshalValue = new ClassStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 4995626822780781809L;
+    private static final long serialVersionUID = 4995619201788012387L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java
index 731a5e807df2..756debe75a4e 100644
--- a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java
+++ b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java
@@ -240,5 +240,5 @@ static public java.util.Optional<LargeStruct> ice_read(com.zeroc.Ice.InputStream
     private static final LargeStruct _nullMarshalValue = new LargeStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2321906194507294037L;
+    private static final long serialVersionUID = 7053530365099760213L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/MyClass.java b/slice2java/cpp/test/Ice/stream/Test/MyClass.java
index 929936873837..2f1678129b15 100644
--- a/slice2java/cpp/test/Ice/stream/Test/MyClass.java
+++ b/slice2java/cpp/test/Ice/stream/Test/MyClass.java
@@ -85,7 +85,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1568261774806541991L;
+    private static final long serialVersionUID = -5749671876583911385L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/stream/Test/MyException.java b/slice2java/cpp/test/Ice/stream/Test/MyException.java
index e89a126c88bb..2b9d03d1919d 100644
--- a/slice2java/cpp/test/Ice/stream/Test/MyException.java
+++ b/slice2java/cpp/test/Ice/stream/Test/MyException.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734234682029038158L;
+    private static final long serialVersionUID = 5734225777387217500L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java
index ab1eeeb86d81..7b6192b4ac66 100644
--- a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java
+++ b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java
@@ -162,7 +162,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9018068206561883108L;
+    private static final long serialVersionUID = -8126991725214959196L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java
index fce670ede72f..6951b3acaf6c 100644
--- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java
+++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1404701300268113263L;
+    private static final long serialVersionUID = -1404710044752875517L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java
index 004312480047..171a309373a5 100644
--- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java
+++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java
@@ -227,5 +227,5 @@ static public java.util.Optional<NestedStruct> ice_read(com.zeroc.Ice.InputStrea
     private static final NestedStruct _nullMarshalValue = new NestedStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 7255626933445585066L;
+    private static final long serialVersionUID = 7875837372279509240L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java
index 0f4ce0bbde51..08044c511ad4 100644
--- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java
+++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8562117029348685469L;
+    private static final long serialVersionUID = -8562124650346026383L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java
index ddd11fdf2785..6d0f5ef05e17 100644
--- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java
+++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java
@@ -227,5 +227,5 @@ static public java.util.Optional<NestedStruct2> ice_read(com.zeroc.Ice.InputStre
     private static final NestedStruct2 _nullMarshalValue = new NestedStruct2();
 
     /** @hidden */
-    private static final long serialVersionUID = 1004961255363758193L;
+    private static final long serialVersionUID = -7849753013393863517L;
 }
diff --git a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java
index a520b6e24abb..5f44d9bf1713 100644
--- a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java
@@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 27300692988778546L;
+    private static final long serialVersionUID = -4003030438345155662L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java
index b9f57704b3a5..f66285939f91 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java
@@ -106,7 +106,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8209060591666745973L;
+    private static final long serialVersionUID = -4139764492915776181L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java
index 91496ae8c339..f076081a4fc4 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8962794303246182463L;
+    private static final long serialVersionUID = -391021036134310273L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 340844bc2808..97f03d1a9a5f 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java
@@ -55,7 +55,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -548271630038793867L;
+    private static final long serialVersionUID = -6620790308551585723L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 08c908690675..da9f13ae42ed 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5660046423406067785L;
+    private static final long serialVersionUID = -4917331786607484167L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java
index cd25932e8366..3609be637eff 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java
@@ -106,7 +106,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6549720566584023063L;
+    private static final long serialVersionUID = -822619424151748137L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java
index 2281c5c92ab9..3ddd75855f8c 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java
@@ -68,7 +68,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1287481675939963969L;
+    private static final long serialVersionUID = -1238760632888625793L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java
index 0139acc9ca02..4d4ff4e7150b 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java
@@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3422453734338125064L;
+    private static final long serialVersionUID = -325605372528360632L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index 7d3c87494e8b..b5c81e378040 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2602896003645572079L;
+    private static final long serialVersionUID = 8217776110337409249L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index 97f9651c0452..7e8da7399776 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
@@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8361588900567607161L;
+    private static final long serialVersionUID = 7896191554919719689L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java
index b4e7d4f69e5d..5fb5c84dae9c 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7731890322525280953L;
+    private static final long serialVersionUID = 8042504141766110215L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java
index c84464e75d71..2fb7b8c1afbc 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<InnerStruct> ice_read(com.zeroc.Ice.InputStream
     private static final InnerStruct _nullMarshalValue = new InnerStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 5127390325270502783L;
+    private static final long serialVersionUID = 5127387656154797455L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java
index e7caa6c1ce87..5526d133263c 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java
@@ -143,5 +143,5 @@ static public java.util.Optional<InnerStruct2> ice_read(com.zeroc.Ice.InputStrea
     private static final InnerStruct2 _nullMarshalValue = new InnerStruct2();
 
     /** @hidden */
-    private static final long serialVersionUID = -7135053962233720096L;
+    private static final long serialVersionUID = -7135062290647164400L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java
index 46f4ab667d5b..7d1a46b3dc33 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct1> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct1 _nullMarshalValue = new Struct1();
 
     /** @hidden */
-    private static final long serialVersionUID = -7901600705413659628L;
+    private static final long serialVersionUID = 7183002295309660308L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java
index 4dec9e01a2c4..9c2d6a04fa9a 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java
@@ -370,5 +370,5 @@ static public java.util.Optional<Struct2> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct2 _nullMarshalValue = new Struct2();
 
     /** @hidden */
-    private static final long serialVersionUID = 603389077211420407L;
+    private static final long serialVersionUID = 3001351906671075895L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java
index 724ccab740e0..58594dd45e0d 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java
@@ -367,5 +367,5 @@ static public java.util.Optional<Struct3> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct3 _nullMarshalValue = new Struct3();
 
     /** @hidden */
-    private static final long serialVersionUID = -8042022122923797559L;
+    private static final long serialVersionUID = -1800297973374480055L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java
index 426ad6283954..f872700a6d19 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java
@@ -367,5 +367,5 @@ static public java.util.Optional<Struct4> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct4 _nullMarshalValue = new Struct4();
 
     /** @hidden */
-    private static final long serialVersionUID = -2359905758423320626L;
+    private static final long serialVersionUID = -6355018585240949170L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java
index c3b9c356b548..b7915b4d8bc0 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java
@@ -288,5 +288,5 @@ static public java.util.Optional<StructNoDefaults> ice_read(com.zeroc.Ice.InputS
     private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults();
 
     /** @hidden */
-    private static final long serialVersionUID = -1962605611545907486L;
+    private static final long serialVersionUID = -6093763099564999134L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java
index 791a1ae2f724..c911f546512d 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java
@@ -311,5 +311,5 @@ static public java.util.Optional<StructProperty> ice_read(com.zeroc.Ice.InputStr
     private static final StructProperty _nullMarshalValue = new StructProperty();
 
     /** @hidden */
-    private static final long serialVersionUID = -1458178842654793881L;
+    private static final long serialVersionUID = -7291547521689333849L;
 }
diff --git a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java
index 186300c103c1..bc0bacdbd21b 100644
--- a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java
+++ b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java
@@ -152,5 +152,5 @@ static public java.util.Optional<TEstNv> ice_read(com.zeroc.Ice.InputStream istr
     private static final TEstNv _nullMarshalValue = new TEstNv();
 
     /** @hidden */
-    private static final long serialVersionUID = -7218773241238492158L;
+    private static final long serialVersionUID = -7608982785824954782L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/A.java b/slice2java/csharp/test/Ice/exceptions/Test/A.java
index f930fc4ce937..da8410ee75af 100644
--- a/slice2java/csharp/test/Ice/exceptions/Test/A.java
+++ b/slice2java/csharp/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823737062994880000L;
+    private static final long serialVersionUID = 7823745373664787619L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/B.java b/slice2java/csharp/test/Ice/exceptions/Test/B.java
index b58f511ab20f..d0882ef58784 100644
--- a/slice2java/csharp/test/Ice/exceptions/Test/B.java
+++ b/slice2java/csharp/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861419000673376960L;
+    private static final long serialVersionUID = -3861410690003469341L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/C.java b/slice2java/csharp/test/Ice/exceptions/Test/C.java
index 2bf2957548d4..0bc0b4b34051 100644
--- a/slice2java/csharp/test/Ice/exceptions/Test/C.java
+++ b/slice2java/csharp/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080690754197665280L;
+    private static final long serialVersionUID = 1080699064867572899L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/D.java b/slice2java/csharp/test/Ice/exceptions/Test/D.java
index 768f76982969..eb4113640ebc 100644
--- a/slice2java/csharp/test/Ice/exceptions/Test/D.java
+++ b/slice2java/csharp/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780373267428701248L;
+    private static final long serialVersionUID = 4780381578098608867L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Color.java b/slice2java/csharp/test/Ice/hash/Test/Color.java
index 54893c76ca3c..dd7b98522742 100644
--- a/slice2java/csharp/test/Ice/hash/Test/Color.java
+++ b/slice2java/csharp/test/Ice/hash/Test/Color.java
@@ -168,5 +168,5 @@ static public java.util.Optional<Color> ice_read(com.zeroc.Ice.InputStream istr,
     private static final Color _nullMarshalValue = new Color();
 
     /** @hidden */
-    private static final long serialVersionUID = 6141405887780095350L;
+    private static final long serialVersionUID = -7200184688126883210L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java
index dbb4bdcb6b53..a5288f6b9e81 100644
--- a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java
+++ b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java
@@ -142,5 +142,5 @@ static public java.util.Optional<ColorPalette> ice_read(com.zeroc.Ice.InputStrea
     private static final ColorPalette _nullMarshalValue = new ColorPalette();
 
     /** @hidden */
-    private static final long serialVersionUID = -2820068042142495985L;
+    private static final long serialVersionUID = -2820072592214048924L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Draw.java b/slice2java/csharp/test/Ice/hash/Test/Draw.java
index 397e661e031d..f3d3c4d35390 100644
--- a/slice2java/csharp/test/Ice/hash/Test/Draw.java
+++ b/slice2java/csharp/test/Ice/hash/Test/Draw.java
@@ -166,5 +166,5 @@ static public java.util.Optional<Draw> ice_read(com.zeroc.Ice.InputStream istr,
     private static final Draw _nullMarshalValue = new Draw();
 
     /** @hidden */
-    private static final long serialVersionUID = 3714319656175386140L;
+    private static final long serialVersionUID = 5234687751848581564L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java
index 911a285fd8fd..8ea8434a4850 100644
--- a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java
+++ b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java
@@ -54,5 +54,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1224575382828231295L;
+    private static final long serialVersionUID = -1224574642884906305L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java
index b989e3f74c15..7a055e40f306 100644
--- a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java
+++ b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java
@@ -54,5 +54,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8727118618779878029L;
+    private static final long serialVersionUID = -8727124490995082867L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/OtherException.java b/slice2java/csharp/test/Ice/hash/Test/OtherException.java
index 5c8add2cebe0..140dc5256e1a 100644
--- a/slice2java/csharp/test/Ice/hash/Test/OtherException.java
+++ b/slice2java/csharp/test/Ice/hash/Test/OtherException.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1891712918838586472L;
+    private static final long serialVersionUID = 1040515556999346336L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Pen.java b/slice2java/csharp/test/Ice/hash/Test/Pen.java
index 8b72ed5a40af..f343226010e6 100644
--- a/slice2java/csharp/test/Ice/hash/Test/Pen.java
+++ b/slice2java/csharp/test/Ice/hash/Test/Pen.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1567918703334684257L;
+    private static final long serialVersionUID = -783703251366243902L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/hash/Test/Point.java b/slice2java/csharp/test/Ice/hash/Test/Point.java
index 3dc61930129f..901dfd5c524a 100644
--- a/slice2java/csharp/test/Ice/hash/Test/Point.java
+++ b/slice2java/csharp/test/Ice/hash/Test/Point.java
@@ -148,5 +148,5 @@ static public java.util.Optional<Point> ice_read(com.zeroc.Ice.InputStream istr,
     private static final Point _nullMarshalValue = new Point();
 
     /** @hidden */
-    private static final long serialVersionUID = -5044748324981114704L;
+    private static final long serialVersionUID = -3251034632856734800L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/PointD.java b/slice2java/csharp/test/Ice/hash/Test/PointD.java
index d949605274dd..4a88dd339cf7 100644
--- a/slice2java/csharp/test/Ice/hash/Test/PointD.java
+++ b/slice2java/csharp/test/Ice/hash/Test/PointD.java
@@ -158,5 +158,5 @@ static public java.util.Optional<PointD> ice_read(com.zeroc.Ice.InputStream istr
     private static final PointD _nullMarshalValue = new PointD();
 
     /** @hidden */
-    private static final long serialVersionUID = -2323253472830148855L;
+    private static final long serialVersionUID = 6343571632964877297L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/PointF.java b/slice2java/csharp/test/Ice/hash/Test/PointF.java
index 8aa119fcad79..3471e50e1f2c 100644
--- a/slice2java/csharp/test/Ice/hash/Test/PointF.java
+++ b/slice2java/csharp/test/Ice/hash/Test/PointF.java
@@ -158,5 +158,5 @@ static public java.util.Optional<PointF> ice_read(com.zeroc.Ice.InputStream istr
     private static final PointF _nullMarshalValue = new PointF();
 
     /** @hidden */
-    private static final long serialVersionUID = -4349832451942499739L;
+    private static final long serialVersionUID = 5155107483984207064L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Polyline.java b/slice2java/csharp/test/Ice/hash/Test/Polyline.java
index 61c0dda42d31..fb73225b94df 100644
--- a/slice2java/csharp/test/Ice/hash/Test/Polyline.java
+++ b/slice2java/csharp/test/Ice/hash/Test/Polyline.java
@@ -139,5 +139,5 @@ static public java.util.Optional<Polyline> ice_read(com.zeroc.Ice.InputStream is
     private static final Polyline _nullMarshalValue = new Polyline();
 
     /** @hidden */
-    private static final long serialVersionUID = -345025037200449134L;
+    private static final long serialVersionUID = -345029754746217188L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java
index eca8c1598e8c..f635a509fc86 100644
--- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java
+++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2568820117200408551L;
+    private static final long serialVersionUID = 2568824992414069156L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java
index 1114fb7a1dc6..6658eaddca65 100644
--- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java
+++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6709851971820961775L;
+    private static final long serialVersionUID = -6709851394447374254L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java
index 579581d981ba..19cdd69a4dfd 100644
--- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java
+++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 244437868416719496L;
+    private static final long serialVersionUID = 244431675744584779L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java
index ad95ea096aeb..68896d7db467 100644
--- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java
+++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1207064053452404722L;
+    private static final long serialVersionUID = -1207059340963991091L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
index e6d6f098889c..c77706100b8f 100644
--- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
+++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7599601709367136127L;
+    private static final long serialVersionUID = 7599607907043996988L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java
index 9193674da317..16570b9037e8 100644
--- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java
+++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9211533048599087179L;
+    private static final long serialVersionUID = 9211535869319372956L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java
index da70c43a0f79..03f1956bf084 100644
--- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java
+++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 770567599141217737L;
+    private static final long serialVersionUID = 770570063143580062L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java
index 9e3a8baee750..772be9c5ba42 100644
--- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java
+++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4823062828034829052L;
+    private static final long serialVersionUID = -4823065775167038381L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java
index df8a38dcdcbb..d9d8b8e01d2d 100644
--- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java
+++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2279075387342264789L;
+    private static final long serialVersionUID = 2279078210453243010L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/A.java b/slice2java/csharp/test/Ice/objects/Test/A.java
index 42485230dd62..513484e1bdf4 100644
--- a/slice2java/csharp/test/Ice/objects/Test/A.java
+++ b/slice2java/csharp/test/Ice/objects/Test/A.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4216345533948315681L;
+    private static final long serialVersionUID = -7908546774176531406L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/A1.java b/slice2java/csharp/test/Ice/objects/Test/A1.java
index 38d0dba3fda2..4b8991958d0b 100644
--- a/slice2java/csharp/test/Ice/objects/Test/A1.java
+++ b/slice2java/csharp/test/Ice/objects/Test/A1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5926745442535907461L;
+    private static final long serialVersionUID = -5926737320431718679L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/B.java b/slice2java/csharp/test/Ice/objects/Test/B.java
index 7a94629078a1..5852b412138b 100644
--- a/slice2java/csharp/test/Ice/objects/Test/B.java
+++ b/slice2java/csharp/test/Ice/objects/Test/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8890916441818014281L;
+    private static final long serialVersionUID = -8890913818830229317L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/B1.java b/slice2java/csharp/test/Ice/objects/Test/B1.java
index 5e3ef1e6faae..f6e90825401d 100644
--- a/slice2java/csharp/test/Ice/objects/Test/B1.java
+++ b/slice2java/csharp/test/Ice/objects/Test/B1.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -970768394151099004L;
+    private static final long serialVersionUID = -7090972797982688252L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Base.java b/slice2java/csharp/test/Ice/objects/Test/Base.java
index 15668b4c8845..7e8fc7b7b221 100644
--- a/slice2java/csharp/test/Ice/objects/Test/Base.java
+++ b/slice2java/csharp/test/Ice/objects/Test/Base.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8135252880512761352L;
+    private static final long serialVersionUID = -3294523822025692298L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/C.java b/slice2java/csharp/test/Ice/objects/Test/C.java
index e35a39de3f3f..f8d1892edd5b 100644
--- a/slice2java/csharp/test/Ice/objects/Test/C.java
+++ b/slice2java/csharp/test/Ice/objects/Test/C.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5949937185384414317L;
+    private static final long serialVersionUID = -1086206542501145394L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/COneMember.java b/slice2java/csharp/test/Ice/objects/Test/COneMember.java
index 3535e2a16625..b0b571eb814c 100644
--- a/slice2java/csharp/test/Ice/objects/Test/COneMember.java
+++ b/slice2java/csharp/test/Ice/objects/Test/COneMember.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3050969842662844873L;
+    private static final long serialVersionUID = 3050967054298516736L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java
index 3b352fa648fd..9b3c3756988c 100644
--- a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java
+++ b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6052051403217098149L;
+    private static final long serialVersionUID = -5088083634995684453L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/D.java b/slice2java/csharp/test/Ice/objects/Test/D.java
index 1e150d2170d8..19f46ce53d0e 100644
--- a/slice2java/csharp/test/Ice/objects/Test/D.java
+++ b/slice2java/csharp/test/Ice/objects/Test/D.java
@@ -57,7 +57,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5833133240288135122L;
+    private static final long serialVersionUID = 4136357721719045581L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/D1.java b/slice2java/csharp/test/Ice/objects/Test/D1.java
index 1457121d3d57..7c3be26e4c1d 100644
--- a/slice2java/csharp/test/Ice/objects/Test/D1.java
+++ b/slice2java/csharp/test/Ice/objects/Test/D1.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6684937081440076227L;
+    private static final long serialVersionUID = -30450535605189949L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/E.java b/slice2java/csharp/test/Ice/objects/Test/E.java
index 2dd1c0292f6f..21ce25f01a73 100644
--- a/slice2java/csharp/test/Ice/objects/Test/E.java
+++ b/slice2java/csharp/test/Ice/objects/Test/E.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2089630686312808732L;
+    private static final long serialVersionUID = -7881639735507357466L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/EBase.java b/slice2java/csharp/test/Ice/objects/Test/EBase.java
index 0cbffc89df23..c0dfff5c4e9d 100644
--- a/slice2java/csharp/test/Ice/objects/Test/EBase.java
+++ b/slice2java/csharp/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1021146282318139826L;
+    private static final long serialVersionUID = -4443913330689194290L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/EDerived.java b/slice2java/csharp/test/Ice/objects/Test/EDerived.java
index 700ddf569968..f58511aca434 100644
--- a/slice2java/csharp/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/csharp/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -473977126927449646L;
+    private static final long serialVersionUID = -2318408791513211950L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java
index c9cc85a0eba4..93bc7215f486 100644
--- a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225291802670584890L;
+    private static final long serialVersionUID = -6225278065088771825L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java
index 373beb369e89..35c7bdc31c91 100644
--- a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3798826247639937068L;
+    private static final long serialVersionUID = 1532306244304633492L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/F.java b/slice2java/csharp/test/Ice/objects/Test/F.java
index 4bb8648a2b35..cf17d6feec5c 100644
--- a/slice2java/csharp/test/Ice/objects/Test/F.java
+++ b/slice2java/csharp/test/Ice/objects/Test/F.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5049977928804478481L;
+    private static final long serialVersionUID = 8668814066108844177L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/F1.java b/slice2java/csharp/test/Ice/objects/Test/F1.java
index 6ad5f00c6889..b7d659989180 100644
--- a/slice2java/csharp/test/Ice/objects/Test/F1.java
+++ b/slice2java/csharp/test/Ice/objects/Test/F1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6192369596280195870L;
+    private static final long serialVersionUID = 6192372666178055987L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/F3.java b/slice2java/csharp/test/Ice/objects/Test/F3.java
index f22348c03690..2b2f8d109f63 100644
--- a/slice2java/csharp/test/Ice/objects/Test/F3.java
+++ b/slice2java/csharp/test/Ice/objects/Test/F3.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6096747916789589695L;
+    private static final long serialVersionUID = -9008633280068436683L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/IBase.java b/slice2java/csharp/test/Ice/objects/Test/IBase.java
index 1e5518f29f6a..300dfdb60c55 100644
--- a/slice2java/csharp/test/Ice/objects/Test/IBase.java
+++ b/slice2java/csharp/test/Ice/objects/Test/IBase.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4060270349405625533L;
+    private static final long serialVersionUID = 4060273176500349999L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/IDerived.java b/slice2java/csharp/test/Ice/objects/Test/IDerived.java
index e6a5009c1bdf..6294092958f7 100644
--- a/slice2java/csharp/test/Ice/objects/Test/IDerived.java
+++ b/slice2java/csharp/test/Ice/objects/Test/IDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7299536633863321253L;
+    private static final long serialVersionUID = 7299539422080534583L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Inner/A.java b/slice2java/csharp/test/Ice/objects/Test/Inner/A.java
index 6eb22eb7f99e..860241344a42 100644
--- a/slice2java/csharp/test/Ice/objects/Test/Inner/A.java
+++ b/slice2java/csharp/test/Ice/objects/Test/Inner/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1425259074020488355L;
+    private static final long serialVersionUID = -1425250990715908655L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java b/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java
index e20bbd102205..cbfbb325ac6f 100644
--- a/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337224426301794110L;
+    private static final long serialVersionUID = -2337227253396518576L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java
index e7b4b0977516..8e92672ae04e 100644
--- a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java
+++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1298677308078543749L;
+    private static final long serialVersionUID = -1298690879990326347L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java
index 005ca871c78f..8096912f195a 100644
--- a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842232292961557862L;
+    private static final long serialVersionUID = 1842229465876033268L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/K.java b/slice2java/csharp/test/Ice/objects/Test/K.java
index 349af4bb4746..52bc4c45617b 100644
--- a/slice2java/csharp/test/Ice/objects/Test/K.java
+++ b/slice2java/csharp/test/Ice/objects/Test/K.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4645161393459279344L;
+    private static final long serialVersionUID = 4645164016348677968L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/L.java b/slice2java/csharp/test/Ice/objects/Test/L.java
index 422a99d34aa2..869515430dfd 100644
--- a/slice2java/csharp/test/Ice/objects/Test/L.java
+++ b/slice2java/csharp/test/Ice/objects/Test/L.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6629737247527252336L;
+    private static final long serialVersionUID = 6629739909323276642L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/M.java b/slice2java/csharp/test/Ice/objects/Test/M.java
index e6c8e9a23539..bcef8fec1b59 100644
--- a/slice2java/csharp/test/Ice/objects/Test/M.java
+++ b/slice2java/csharp/test/Ice/objects/Test/M.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8088091276753416211L;
+    private static final long serialVersionUID = -8088104809979918735L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Recursive.java b/slice2java/csharp/test/Ice/objects/Test/Recursive.java
index 988dfa5f398e..75337dd39ac2 100644
--- a/slice2java/csharp/test/Ice/objects/Test/Recursive.java
+++ b/slice2java/csharp/test/Ice/objects/Test/Recursive.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3617877158254754093L;
+    private static final long serialVersionUID = 3617890691473485114L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/S.java b/slice2java/csharp/test/Ice/objects/Test/S.java
index ea06abcf061e..7856e77722c9 100644
--- a/slice2java/csharp/test/Ice/objects/Test/S.java
+++ b/slice2java/csharp/test/Ice/objects/Test/S.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 481768449832279875L;
+    private static final long serialVersionUID = 481776533058957521L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/S1.java b/slice2java/csharp/test/Ice/objects/Test/S1.java
index 42d537bbc740..168cb6c1aba1 100644
--- a/slice2java/csharp/test/Ice/objects/Test/S1.java
+++ b/slice2java/csharp/test/Ice/objects/Test/S1.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = 7211338992996285573L;
+    private static final long serialVersionUID = 7211336331245147669L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/SC1.java b/slice2java/csharp/test/Ice/objects/Test/SC1.java
index 0461409bdef2..982408b6aeaf 100644
--- a/slice2java/csharp/test/Ice/objects/Test/SC1.java
+++ b/slice2java/csharp/test/Ice/objects/Test/SC1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<SC1> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final SC1 _nullMarshalValue = new SC1();
 
     /** @hidden */
-    private static final long serialVersionUID = 186209885908386153L;
+    private static final long serialVersionUID = 186212508790099835L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java
index 272d03bbe993..4e295fa3a82b 100644
--- a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java
+++ b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java
@@ -142,5 +142,5 @@ static public java.util.Optional<SOneMember> ice_read(com.zeroc.Ice.InputStream
     private static final SOneMember _nullMarshalValue = new SOneMember();
 
     /** @hidden */
-    private static final long serialVersionUID = 6227760671132351312L;
+    private static final long serialVersionUID = 6227747098858587417L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java
index f3ad6d6931fe..fdf5ab09f320 100644
--- a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java
+++ b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java
@@ -155,5 +155,5 @@ static public java.util.Optional<STwoMembers> ice_read(com.zeroc.Ice.InputStream
     private static final STwoMembers _nullMarshalValue = new STwoMembers();
 
     /** @hidden */
-    private static final long serialVersionUID = 605522806576565058L;
+    private static final long serialVersionUID = 6521239897388054018L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/StructKey.java b/slice2java/csharp/test/Ice/objects/Test/StructKey.java
index ad842475fcd7..bfc1d2f05830 100644
--- a/slice2java/csharp/test/Ice/objects/Test/StructKey.java
+++ b/slice2java/csharp/test/Ice/objects/Test/StructKey.java
@@ -153,5 +153,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = -2461696427259685080L;
+    private static final long serialVersionUID = 8776797341301028650L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java
index ea5f55955c3b..d4bc9249d351 100644
--- a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java
+++ b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<AnotherStruct> ice_read(com.zeroc.Ice.InputStre
     private static final AnotherStruct _nullMarshalValue = new AnotherStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2723850441403833599L;
+    private static final long serialVersionUID = 2723846109658984603L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java
index 12d9dcc758cc..1da805993b37 100644
--- a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java
+++ b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6775397588810770393L;
+    private static final long serialVersionUID = -6517771340169456387L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java
index b9285e6b8232..3456fb750850 100644
--- a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java
+++ b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java
@@ -148,5 +148,5 @@ static public java.util.Optional<MyStruct> ice_read(com.zeroc.Ice.InputStream is
     private static final MyStruct _nullMarshalValue = new MyStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2503261750487237437L;
+    private static final long serialVersionUID = -2370475179375261955L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java
index 7a13f14dbacf..a0c6aaf97440 100644
--- a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java
+++ b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java
@@ -170,5 +170,5 @@ static public java.util.Optional<MyStruct1> ice_read(com.zeroc.Ice.InputStream i
     private static final MyStruct1 _nullMarshalValue = new MyStruct1();
 
     /** @hidden */
-    private static final long serialVersionUID = 6327118817392094160L;
+    private static final long serialVersionUID = -8072390744167374796L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/Structure.java b/slice2java/csharp/test/Ice/operations/Test/Structure.java
index 8b6262e5932b..e13863edd425 100644
--- a/slice2java/csharp/test/Ice/operations/Test/Structure.java
+++ b/slice2java/csharp/test/Ice/operations/Test/Structure.java
@@ -170,5 +170,5 @@ static public java.util.Optional<Structure> ice_read(com.zeroc.Ice.InputStream i
     private static final Structure _nullMarshalValue = new Structure();
 
     /** @hidden */
-    private static final long serialVersionUID = 1324283794048029991L;
+    private static final long serialVersionUID = 3753091265401683011L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/A.java b/slice2java/csharp/test/Ice/optional/Test/A.java
index 4a96c3cce37d..93684cf45709 100644
--- a/slice2java/csharp/test/Ice/optional/Test/A.java
+++ b/slice2java/csharp/test/Ice/optional/Test/A.java
@@ -212,7 +212,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1646487116398901872L;
+    private static final long serialVersionUID = -3792322062386016496L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/B.java b/slice2java/csharp/test/Ice/optional/Test/B.java
index 42a2534ba691..0ec7c20eb5dd 100644
--- a/slice2java/csharp/test/Ice/optional/Test/B.java
+++ b/slice2java/csharp/test/Ice/optional/Test/B.java
@@ -107,7 +107,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1577404167588084963L;
+    private static final long serialVersionUID = 3885377780729614947L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/C.java b/slice2java/csharp/test/Ice/optional/Test/C.java
index eae8c2ad62ae..7f0b131aceba 100644
--- a/slice2java/csharp/test/Ice/optional/Test/C.java
+++ b/slice2java/csharp/test/Ice/optional/Test/C.java
@@ -110,7 +110,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -784668508195029571L;
+    private static final long serialVersionUID = 8518876858534154365L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java
index 3f081abc5925..bc570ae1dda5 100644
--- a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5504963185560711392L;
+    private static final long serialVersionUID = 7232564077665820567L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/E.java b/slice2java/csharp/test/Ice/optional/Test/E.java
index dc8e96c3fe93..02303791e846 100644
--- a/slice2java/csharp/test/Ice/optional/Test/E.java
+++ b/slice2java/csharp/test/Ice/optional/Test/E.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1850732655407655405L;
+    private static final long serialVersionUID = -1850740614706312602L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/F.java b/slice2java/csharp/test/Ice/optional/Test/F.java
index 672a405a1f71..8e7dfad3e756 100644
--- a/slice2java/csharp/test/Ice/optional/Test/F.java
+++ b/slice2java/csharp/test/Ice/optional/Test/F.java
@@ -105,7 +105,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6430494179608508576L;
+    private static final long serialVersionUID = -6430496810337439723L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java
index 6007e8104b49..1099b3dd9bfd 100644
--- a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java
+++ b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<FixedStruct> ice_read(com.zeroc.Ice.InputStream
     private static final FixedStruct _nullMarshalValue = new FixedStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 1569613753926536368L;
+    private static final long serialVersionUID = 1569605668138303773L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/G.java b/slice2java/csharp/test/Ice/optional/Test/G.java
index 53f2b69a123e..652da0c8fde7 100644
--- a/slice2java/csharp/test/Ice/optional/Test/G.java
+++ b/slice2java/csharp/test/Ice/optional/Test/G.java
@@ -168,7 +168,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 705252480548106195L;
+    private static final long serialVersionUID = 3145568058537696467L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/G1.java b/slice2java/csharp/test/Ice/optional/Test/G1.java
index cf7a7a096ef5..72214521e3bf 100644
--- a/slice2java/csharp/test/Ice/optional/Test/G1.java
+++ b/slice2java/csharp/test/Ice/optional/Test/G1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<G1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G1 _nullMarshalValue = new G1();
 
     /** @hidden */
-    private static final long serialVersionUID = 7339783144178536238L;
+    private static final long serialVersionUID = 7339780640041174681L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/G2.java b/slice2java/csharp/test/Ice/optional/Test/G2.java
index d96530a1ff21..033262edd354 100644
--- a/slice2java/csharp/test/Ice/optional/Test/G2.java
+++ b/slice2java/csharp/test/Ice/optional/Test/G2.java
@@ -138,5 +138,5 @@ static public java.util.Optional<G2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G2 _nullMarshalValue = new G2();
 
     /** @hidden */
-    private static final long serialVersionUID = 3824557957926174973L;
+    private static final long serialVersionUID = 3824549998639891949L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java
index 5d7aad394579..cd795ca6ed56 100644
--- a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java
+++ b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java
@@ -1657,7 +1657,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3183373650890462162L;
+    private static final long serialVersionUID = -6000463760730979370L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java
index 3cb32ee2525a..012fd775950c 100644
--- a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java
+++ b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java
@@ -96,7 +96,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7219608659393151394L;
+    private static final long serialVersionUID = -7219600700015832013L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java
index f18ce053a40f..36aec541226c 100644
--- a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -937975645695905099L;
+    private static final long serialVersionUID = 8089834271151591799L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java
index 32fcb0c07dd1..29efee376f73 100644
--- a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java
+++ b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java
@@ -186,7 +186,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3847698074974839621L;
+    private static final long serialVersionUID = 7503467738664121403L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java
index 06246e582470..0b2dd7e2332e 100644
--- a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894245518111803431L;
+    private static final long serialVersionUID = 2894242848521646160L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java
index 43f25f77afe3..ef11fd935f39 100644
--- a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java
+++ b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<SmallStruct> ice_read(com.zeroc.Ice.InputStream
     private static final SmallStruct _nullMarshalValue = new SmallStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 6700991849125904742L;
+    private static final long serialVersionUID = 6700983928693080811L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java
index a970ecf3f40d..efa61d16b9e3 100644
--- a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java
+++ b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<VarStruct> ice_read(com.zeroc.Ice.InputStream i
     private static final VarStruct _nullMarshalValue = new VarStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -1912285723405625178L;
+    private static final long serialVersionUID = -1912288227542986735L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/WD.java b/slice2java/csharp/test/Ice/optional/Test/WD.java
index f96ccddcf663..37a842eb6b4d 100644
--- a/slice2java/csharp/test/Ice/optional/Test/WD.java
+++ b/slice2java/csharp/test/Ice/optional/Test/WD.java
@@ -152,7 +152,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3101057455131864976L;
+    private static final long serialVersionUID = -4579154424702861622L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C.java b/slice2java/csharp/test/Ice/scope/Test/C.java
index 44f13affef3e..be86969a54e3 100644
--- a/slice2java/csharp/test/Ice/scope/Test/C.java
+++ b/slice2java/csharp/test/Ice/scope/Test/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5190252056206750019L;
+    private static final long serialVersionUID = -5190247422419677255L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C1.java b/slice2java/csharp/test/Ice/scope/Test/C1.java
index 16cc3d940152..eacabc9d81e1 100644
--- a/slice2java/csharp/test/Ice/scope/Test/C1.java
+++ b/slice2java/csharp/test/Ice/scope/Test/C1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8893237963785524924L;
+    private static final long serialVersionUID = 8893233009714395832L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C2.java b/slice2java/csharp/test/Ice/scope/Test/C2.java
index 480d5e9f9ebc..bb2c0293b366 100644
--- a/slice2java/csharp/test/Ice/scope/Test/C2.java
+++ b/slice2java/csharp/test/Ice/scope/Test/C2.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -826824359899783194L;
+    private static final long serialVersionUID = -6234399837471253790L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/C.java b/slice2java/csharp/test/Ice/scope/Test/Inner/C.java
index 2be7a5631d60..6b7b0fb84285 100644
--- a/slice2java/csharp/test/Ice/scope/Test/Inner/C.java
+++ b/slice2java/csharp/test/Ice/scope/Test/Inner/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4615624896015877422L;
+    private static final long serialVersionUID = 4615623072463392682L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java
index 5b3617af805a..b047f9c9474c 100644
--- a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java
+++ b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 672596194701373611L;
+    private static final long serialVersionUID = 672588761011456559L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java
index 5b1fff551d8e..affd00e85183 100644
--- a/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java
+++ b/slice2java/csharp/test/Ice/scope/Test/Inner/Inner2/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 8654434670921766353L;
+    private static final long serialVersionUID = 8654439624993174229L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java
index 96e845be2847..16b33536927e 100644
--- a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java
+++ b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 3694622107781629853L;
+    private static final long serialVersionUID = 3694621451715622809L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S.java b/slice2java/csharp/test/Ice/scope/Test/S.java
index b16ef2a34b5d..73a3c9309b62 100644
--- a/slice2java/csharp/test/Ice/scope/Test/S.java
+++ b/slice2java/csharp/test/Ice/scope/Test/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 2159704797250077027L;
+    private static final long serialVersionUID = 2159697353228982503L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S1.java b/slice2java/csharp/test/Ice/scope/Test/S1.java
index 35b4f2f01f8f..51c5a7762528 100644
--- a/slice2java/csharp/test/Ice/scope/Test/S1.java
+++ b/slice2java/csharp/test/Ice/scope/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = 1241675431535558149L;
+    private static final long serialVersionUID = 1241674610161929857L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S2.java b/slice2java/csharp/test/Ice/scope/Test/S2.java
index 7c8a97bb7f7b..652f46321dea 100644
--- a/slice2java/csharp/test/Ice/scope/Test/S2.java
+++ b/slice2java/csharp/test/Ice/scope/Test/S2.java
@@ -170,5 +170,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = -7552080087642943201L;
+    private static final long serialVersionUID = 1522243991981832091L;
 }
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java
index ce8f73a5a34a..0485983531ae 100644
--- a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java
+++ b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2039940301613246435L;
+    private static final long serialVersionUID = 2039944627962045342L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java
index acae871dbfad..345bfc62d7ab 100644
--- a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java
+++ b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3369465735822476110L;
+    private static final long serialVersionUID = -3369453376506646193L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/S.java b/slice2java/csharp/test/Ice/seqMapping/Test/S.java
index da459184b390..a36e994d6247 100644
--- a/slice2java/csharp/test/Ice/seqMapping/Test/S.java
+++ b/slice2java/csharp/test/Ice/seqMapping/Test/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = -691296934913117155L;
+    private static final long serialVersionUID = -691303635239399328L;
 }
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java
index 46f5da693759..5520ebc96f8c 100644
--- a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java
+++ b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java
@@ -139,5 +139,5 @@ static public java.util.Optional<SD> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final SD _nullMarshalValue = new SD();
 
     /** @hidden */
-    private static final long serialVersionUID = 9219741382457967097L;
+    private static final long serialVersionUID = 9219740623188077380L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java
index 172f68ca3570..182f0a457e99 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477021615576407230L;
+    private static final long serialVersionUID = -477019509113881309L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java
index d4153c5025f7..ad3426a59c26 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485210999879706340L;
+    private static final long serialVersionUID = 3485213106190434501L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index e394f3817c96..307b388f12a1 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717375728338109205L;
+    private static final long serialVersionUID = 1717373787335281076L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 5c027754a7d3..b82904af4817 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384921985448479540L;
+    private static final long serialVersionUID = -7384914258517352531L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index fc0ef06206af..8c253afc07aa 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424372184125260210L;
+    private static final long serialVersionUID = 3424382333695916256L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index d2824d61ee55..94e9577c68ae 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172606262074784093L;
+    private static final long serialVersionUID = -1172594420529151247L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 8c08fcd66e1a..b9e72213793b 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126117373251452966L;
+    private static final long serialVersionUID = -1126112678841498232L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index b6fbd340363d..118a209527ec 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097581553273458758L;
+    private static final long serialVersionUID = -2097571403702802712L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java
index edb9e95e7335..42c846c22ff2 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5629266350436215718L;
+    private static final long serialVersionUID = -6939668240338947238L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java
index 1ad58d1f6171..3121a7793c06 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 320780718101381782L;
+    private static final long serialVersionUID = 2641916680402290070L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java
index b061b124b2e7..73cf09d8f157 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6397003963704536190L;
+    private static final long serialVersionUID = -6396993877344446332L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java
index 29a64c3a35d3..0c205de41395 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9066880040572797101L;
+    private static final long serialVersionUID = -9066882026845933487L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java b/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java
index 7b362ede6bc2..3a4cae0dbd4b 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D1.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8761297851260342087L;
+    private static final long serialVersionUID = 6424446099534763001L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java b/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java
index fbd551b01db5..eb51025e2c4c 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D2.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 296342000521274018L;
+    private static final long serialVersionUID = 5280074356085574094L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java b/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java
index 79942b1c0459..bab13bb5fa0b 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D3.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6482171911376312303L;
+    private static final long serialVersionUID = 8883310698232735663L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java b/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java
index 43ef70cd7cb1..2f36b7228dd6 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/D4.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3804991189910964595L;
+    private static final long serialVersionUID = 3400041940665209715L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java
index 1a522ce59498..883e1d0f9c54 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1279130524744224459L;
+    private static final long serialVersionUID = 757416735749039605L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java
index 686aa68afe41..76b72b1bee7a 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7655919074768468128L;
+    private static final long serialVersionUID = -7655916928348699294L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java
index c7a64476ac41..56ab65ffe997 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Hidden.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2271132785153401139L;
+    private static final long serialVersionUID = -2271134931573305009L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java b/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java
index 47922d81fe1c..b8db8cfeac26 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/MyClass.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4147527769594960240L;
+    private static final long serialVersionUID = 4147520431383793174L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java
index 0070fdcd5eca..3c73774d4a6a 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PBase.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 481704969065292349L;
+    private static final long serialVersionUID = 481707120646328767L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java
index d3aa49b44f48..15608a403b2f 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4426894445691831998L;
+    private static final long serialVersionUID = -4426879069488140988L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java
index 6a142b4d2bb7..93ddafbf0d23 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 850545830619685508L;
+    private static final long serialVersionUID = 850535904396888834L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java
index e53f28afd18a..2a02439b71e7 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCDerived3.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4328903461410841293L;
+    private static final long serialVersionUID = -4328906604834821707L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java
index 6cf63bf7c887..7054ccfaa70a 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PCUnknown.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5081816633323082781L;
+    private static final long serialVersionUID = -5081810679656033179L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java
index c8801d9d5184..ecd6ba299041 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 643078258825640916L;
+    private static final long serialVersionUID = 643076112410476374L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java
index eeb3a9038c63..e853666f1a38 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PNode.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2438003590957697131L;
+    private static final long serialVersionUID = -2438007065001790057L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java
index c730aab9e6de..9e155effb9c5 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6621715838642408132L;
+    private static final long serialVersionUID = 7977295964174519734L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java
index 1ed053122174..2a3815ef2fd2 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknown2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8813709129556449557L;
+    private static final long serialVersionUID = -8813712368767623771L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java
index 3867b9de432c..289247b3a736 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java
@@ -61,5 +61,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4410691977093931635L;
+    private static final long serialVersionUID = 4410699648085840261L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java
index f472cb97fc98..41e6072e6b03 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3651524648137344627L;
+    private static final long serialVersionUID = 3651522501712975857L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java
index 2693ec97c452..f71d25f8d496 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSKnownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8804375052658526550L;
+    private static final long serialVersionUID = 8804372906234157780L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java
index 6f52110364b8..23025674db44 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBSUnknownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4989060700975627517L;
+    private static final long serialVersionUID = -4989058813003462582L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java
index ddb4ada8e636..3982561f460b 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SBase.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5353757111574019488L;
+    private static final long serialVersionUID = -5353754965149650718L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java
index 5b7c732dca54..b3c3c89e4c2e 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6522133794252098714L;
+    private static final long serialVersionUID = -6522130490677034012L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java
index cb6823e16aea..db52f00f0f15 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS2.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7620286024998679461L;
+    private static final long serialVersionUID = 7620289499038316199L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java
index ab02f9764b70..e86fece666e1 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SS3.java
@@ -155,5 +155,5 @@ static public java.util.Optional<SS3> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final SS3 _nullMarshalValue = new SS3();
 
     /** @hidden */
-    private static final long serialVersionUID = -4969433391415690348L;
+    private static final long serialVersionUID = -9119477729798943724L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java
index 6f60ce89c114..18687ff8c15a 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5450694800812628521L;
+    private static final long serialVersionUID = -3424737880843442086L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java b/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
index f71bc9396f5b..6d39c77b7eba 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4106583418045977305L;
+    private static final long serialVersionUID = 7045152496175799225L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java
index c66bf9ed13b8..e4d9c3e783cb 100644
--- a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java
+++ b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java
@@ -240,5 +240,5 @@ static public java.util.Optional<LargeStruct> ice_read(com.zeroc.Ice.InputStream
     private static final LargeStruct _nullMarshalValue = new LargeStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -2145080814414382742L;
+    private static final long serialVersionUID = 8751385343493639786L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/MyClass.java b/slice2java/csharp/test/Ice/stream/Test/MyClass.java
index d2d7ef1d4018..43a7dad6a817 100644
--- a/slice2java/csharp/test/Ice/stream/Test/MyClass.java
+++ b/slice2java/csharp/test/Ice/stream/Test/MyClass.java
@@ -85,7 +85,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2733536889847512065L;
+    private static final long serialVersionUID = 4645370251667277119L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/stream/Test/MyException.java b/slice2java/csharp/test/Ice/stream/Test/MyException.java
index f1887b34a642..c1529062f36b 100644
--- a/slice2java/csharp/test/Ice/stream/Test/MyException.java
+++ b/slice2java/csharp/test/Ice/stream/Test/MyException.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734224493828969069L;
+    private static final long serialVersionUID = 5734224533634832014L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java
index 948f0d9e92ab..d26b64bfabf0 100644
--- a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java
+++ b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java
@@ -162,7 +162,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7194519521631963561L;
+    private static final long serialVersionUID = -4436820682264186569L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/Clash/Cls.java b/slice2java/csharp/test/Slice/escape/Clash/Cls.java
index 8a0ccd0d2e12..dec4fbae31a1 100644
--- a/slice2java/csharp/test/Slice/escape/Clash/Cls.java
+++ b/slice2java/csharp/test/Slice/escape/Clash/Cls.java
@@ -172,7 +172,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2213964793125218871L;
+    private static final long serialVersionUID = 1827781871955085992L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/Clash/Ex.java b/slice2java/csharp/test/Slice/escape/Clash/Ex.java
index c5954a04be22..bdf3cb3f8472 100644
--- a/slice2java/csharp/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/csharp/test/Slice/escape/Clash/Ex.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5968634071782787429L;
+    private static final long serialVersionUID = 698689827074608929L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/Clash/St.java b/slice2java/csharp/test/Slice/escape/Clash/St.java
index e8643e5a5545..ad2fa8081d9b 100644
--- a/slice2java/csharp/test/Slice/escape/Clash/St.java
+++ b/slice2java/csharp/test/Slice/escape/Clash/St.java
@@ -197,5 +197,5 @@ static public java.util.Optional<St> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final St _nullMarshalValue = new St();
 
     /** @hidden */
-    private static final long serialVersionUID = -2923564001549492056L;
+    private static final long serialVersionUID = -5337147913166124043L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java
index 0a798fa0d3ff..36edb945508f 100644
--- a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java
+++ b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java
@@ -122,5 +122,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8544294893536903723L;
+    private static final long serialVersionUID = 4982236652285305072L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/_break.java b/slice2java/csharp/test/Slice/escape/_abstract/_break.java
index cdf7d7080cb8..2ba9d9d7765d 100644
--- a/slice2java/csharp/test/Slice/escape/_abstract/_break.java
+++ b/slice2java/csharp/test/Slice/escape/_abstract/_break.java
@@ -138,5 +138,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr
     private static final _break _nullMarshalValue = new _break();
 
     /** @hidden */
-    private static final long serialVersionUID = 3009638064395416250L;
+    private static final long serialVersionUID = 3009638029599369311L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java
index daf61e4465a2..021ce195c54f 100644
--- a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java
+++ b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8928325813746499089L;
+    private static final long serialVersionUID = -182361819786187510L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java
index 52555572fca2..41402eac3922 100644
--- a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java
+++ b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8293824316927119954L;
+    private static final long serialVersionUID = -8293824031439093173L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java
index 886b209236bd..f7d42808766d 100644
--- a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java
+++ b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6640979173909504899L;
+    private static final long serialVersionUID = -6650686741941176829L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java
index f44757afe98b..ef9605c503fe 100644
--- a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java
+++ b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java
@@ -315,7 +315,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8445031347798816758L;
+    private static final long serialVersionUID = -3874922324914195537L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/macros/Test/Default.java b/slice2java/csharp/test/Slice/macros/Test/Default.java
index 508e724a60db..a3928bdfcf30 100644
--- a/slice2java/csharp/test/Slice/macros/Test/Default.java
+++ b/slice2java/csharp/test/Slice/macros/Test/Default.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1072869236645368158L;
+    private static final long serialVersionUID = -779183887308070754L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java
index 02fce1a7514f..4618b24be44e 100644
--- a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java
+++ b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5934640640145364289L;
+    private static final long serialVersionUID = -7786693764098802945L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/structure/Test/C.java b/slice2java/csharp/test/Slice/structure/Test/C.java
index dc5e332dd06d..87e851ef4bcc 100644
--- a/slice2java/csharp/test/Slice/structure/Test/C.java
+++ b/slice2java/csharp/test/Slice/structure/Test/C.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3172279483593904275L;
+    private static final long serialVersionUID = -3172273346538856681L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/structure/Test/S1.java b/slice2java/csharp/test/Slice/structure/Test/S1.java
index b3500f8e3078..610ece3de543 100644
--- a/slice2java/csharp/test/Slice/structure/Test/S1.java
+++ b/slice2java/csharp/test/Slice/structure/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = -5542850223741413612L;
+    private static final long serialVersionUID = -5542866072799905755L;
 }
diff --git a/slice2java/csharp/test/Slice/structure/Test/S2.java b/slice2java/csharp/test/Slice/structure/Test/S2.java
index 36344b058ca8..3e981314624e 100644
--- a/slice2java/csharp/test/Slice/structure/Test/S2.java
+++ b/slice2java/csharp/test/Slice/structure/Test/S2.java
@@ -286,5 +286,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = 4406742535534648108L;
+    private static final long serialVersionUID = 1881545437098930067L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java b/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java
index 0b90dd42f684..910587d0cbb1 100644
--- a/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java
@@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2708111939277305120L;
+    private static final long serialVersionUID = 5155794013865456061L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java b/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java
index 165747236ed3..a64b26744464 100644
--- a/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java
+++ b/slice2java/java/test/src/main/java/test/Ice/classLoader/test/Ice/classLoader/Test/ConcreteClass.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6434295992248676587L;
+    private static final long serialVersionUID = 6434294123427445166L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java
index ea9b518a247c..10e4a86f67a8 100644
--- a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java
+++ b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/A.java
@@ -138,5 +138,5 @@ static public java.util.Optional<A> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final A _nullMarshalValue = new A();
 
     /** @hidden */
-    private static final long serialVersionUID = 6384634636097458535L;
+    private static final long serialVersionUID = 6384638224103820163L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java
index 39e3e4a814b3..24a8fdbe60d0 100644
--- a/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java
+++ b/slice2java/java/test/src/main/java/test/Ice/custom/test/Ice/custom/Test/S.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = -2014567496469603326L;
+    private static final long serialVersionUID = -2014565226211655514L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java
index a317a18a588a..db1e3b0b05dc 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Base.java
@@ -106,7 +106,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2087803297699031253L;
+    private static final long serialVersionUID = -7527792464190523811L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java
index 20f97631b404..fdc3ead09e78 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7812821563378431391L;
+    private static final long serialVersionUID = -1186231416547156503L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java
index cc56d9d1c64f..34db10c0af0d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaults.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7140702407770046561L;
+    private static final long serialVersionUID = -6533774323859825260L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index f423cd0382b0..564c6791f7a8 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7026199465954464424L;
+    private static final long serialVersionUID = 699073127311380338L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java
index 2f8e04771a03..426025a692f6 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Derived.java
@@ -68,7 +68,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -428606235287365899L;
+    private static final long serialVersionUID = -4733016785815400310L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java
index 35decd34f351..9ab777afee9f 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java
@@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2193392642054557122L;
+    private static final long serialVersionUID = -3229480890574587715L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index 49fcb493cbd4..cb26e3ae6dbb 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6873723114137908165L;
+    private static final long serialVersionUID = 8640360412286724208L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index 6877defd38bd..3888dc003360 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
@@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6814127642169395416L;
+    private static final long serialVersionUID = -5684944401718849150L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java
index 0564ac77d17e..d106d871e45d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/InnerStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<InnerStruct> ice_read(com.zeroc.Ice.InputStream
     private static final InnerStruct _nullMarshalValue = new InnerStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 5127390387476879522L;
+    private static final long serialVersionUID = 5127393408193485634L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java
index 6c02f76340af..ca1b76ae3308 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct1.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct1> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct1 _nullMarshalValue = new Struct1();
 
     /** @hidden */
-    private static final long serialVersionUID = 3971468831117118656L;
+    private static final long serialVersionUID = 5861015065260491927L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java
index cceeb284975a..ded4f7737ac4 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/Struct2.java
@@ -370,5 +370,5 @@ static public java.util.Optional<Struct2> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct2 _nullMarshalValue = new Struct2();
 
     /** @hidden */
-    private static final long serialVersionUID = -3226454919445180755L;
+    private static final long serialVersionUID = 2052655899519135194L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java
index 85d7f1932ebe..ab48cbb70f70 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/StructNoDefaults.java
@@ -274,5 +274,5 @@ static public java.util.Optional<StructNoDefaults> ice_read(com.zeroc.Ice.InputS
     private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults();
 
     /** @hidden */
-    private static final long serialVersionUID = 7741787816335189070L;
+    private static final long serialVersionUID = 6846831072659265955L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java
index c7a9f2cce197..f29ab3a5349f 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823741854341009063L;
+    private static final long serialVersionUID = 7823746586486932857L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java
index 4e5b77f3189b..fb0e3802bffb 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861419499180048921L;
+    private static final long serialVersionUID = -3861409312020343495L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java
index c35a66fed8eb..c96da8d6591e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080695545543794343L;
+    private static final long serialVersionUID = 1080700277689718137L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java
index 1552c478917e..4f21f6732614 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780372768922029287L;
+    private static final long serialVersionUID = 4780382956081734713L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java
index 6bf6200b40de..148d09d6d008 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823738304328553888L;
+    private static final long serialVersionUID = 7823740494560034889L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java
index bd7b017b004f..2cb5e642f5aa 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861417429031959328L;
+    private static final long serialVersionUID = -3861420859117142391L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java
index 30adb2977b14..9ca6f7d70522 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080691995531339168L;
+    private static final long serialVersionUID = 1080694185762820169L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java
index ec227c50218f..a8bc55825dd1 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780374839070118880L;
+    private static final long serialVersionUID = 4780371408984935817L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java
index 92506c0214a1..dba7b687f46e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java
+++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Color.java
@@ -168,5 +168,5 @@ static public java.util.Optional<Color> ice_read(com.zeroc.Ice.InputStream istr,
     private static final Color _nullMarshalValue = new Color();
 
     /** @hidden */
-    private static final long serialVersionUID = -2463143254763106954L;
+    private static final long serialVersionUID = 5977409803734498678L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java
index 4ca267a57d59..b5bc6340f097 100644
--- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java
+++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/ColorPalette.java
@@ -142,5 +142,5 @@ static public java.util.Optional<ColorPalette> ice_read(com.zeroc.Ice.InputStrea
     private static final ColorPalette _nullMarshalValue = new ColorPalette();
 
     /** @hidden */
-    private static final long serialVersionUID = -2820070086809721464L;
+    private static final long serialVersionUID = -2820070031047175698L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java
index 6a0b88b3a870..f711c80271a3 100644
--- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java
+++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Draw.java
@@ -166,5 +166,5 @@ static public java.util.Optional<Draw> ice_read(com.zeroc.Ice.InputStream istr,
     private static final Draw _nullMarshalValue = new Draw();
 
     /** @hidden */
-    private static final long serialVersionUID = 6109431519268105732L;
+    private static final long serialVersionUID = -8318943639069802783L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java
index 54cbcdd922f9..b1a7d8842ff9 100644
--- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java
+++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Pen.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4419576948102410069L;
+    private static final long serialVersionUID = 3854209731238196121L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java
index 1c2fffb9d603..8d173429cdab 100644
--- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java
+++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Point.java
@@ -148,5 +148,5 @@ static public java.util.Optional<Point> ice_read(com.zeroc.Ice.InputStream istr,
     private static final Point _nullMarshalValue = new Point();
 
     /** @hidden */
-    private static final long serialVersionUID = 8006115204680301008L;
+    private static final long serialVersionUID = -7519869298652116912L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java
index e02b73925fd5..a2cb15371397 100644
--- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java
+++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointD.java
@@ -158,5 +158,5 @@ static public java.util.Optional<PointD> ice_read(com.zeroc.Ice.InputStream istr
     private static final PointD _nullMarshalValue = new PointD();
 
     /** @hidden */
-    private static final long serialVersionUID = -3875202449408081066L;
+    private static final long serialVersionUID = -4829678412836264035L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java
index ca84e476cbfe..66b9b2f14e54 100644
--- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java
+++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/PointF.java
@@ -158,5 +158,5 @@ static public java.util.Optional<PointF> ice_read(com.zeroc.Ice.InputStream istr
     private static final PointF _nullMarshalValue = new PointF();
 
     /** @hidden */
-    private static final long serialVersionUID = -6567492561554200007L;
+    private static final long serialVersionUID = 9018701912991856656L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java
index aa0523b3715a..bf9d902ef245 100644
--- a/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java
+++ b/slice2java/java/test/src/main/java/test/Ice/hash/test/Ice/hash/Test/Polyline.java
@@ -139,5 +139,5 @@ static public java.util.Optional<Polyline> ice_read(com.zeroc.Ice.InputStream is
     private static final Polyline _nullMarshalValue = new Polyline();
 
     /** @hidden */
-    private static final long serialVersionUID = -345032784700516213L;
+    private static final long serialVersionUID = -345032315809712732L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java
index 6f634ddac49c..1a423590d3c0 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2558512453788158855L;
+    private static final long serialVersionUID = 7517192228073341750L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java
index 30ead8b2b939..39c756f23ade 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/A1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5926746166984576654L;
+    private static final long serialVersionUID = -5926737117590421389L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java
index 17f016b79432..e44e3e875a5a 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8890918692835790212L;
+    private static final long serialVersionUID = -8890913941598620359L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java
index 9aab16ca41f9..ec3cf508c12e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/B1.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7021274555298340292L;
+    private static final long serialVersionUID = -6794372733314421884L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java
index 797154a0abec..15a391da2c6b 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Base.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3089231035074760915L;
+    private static final long serialVersionUID = -7988193472968797674L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java
index ae68b02e3aa2..1f853d491e17 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/C.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 146882565331435438L;
+    private static final long serialVersionUID = -4068310977241629764L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java
index 6f26ceb0beaa..d7ad3876ad3a 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/COneMember.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3050977218309368386L;
+    private static final long serialVersionUID = 3050967177216670072L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java
index 51cb7a9298d7..bacd047a578b 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/CTwoMembers.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4927255846305937509L;
+    private static final long serialVersionUID = 5808866186043279771L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java
index 102af71618f2..1427c9075734 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D.java
@@ -57,7 +57,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2906417853051080161L;
+    private static final long serialVersionUID = 1053624141185535755L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java
index 2d48481ad967..7f5c48cd3812 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/D1.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2124770088493546749L;
+    private static final long serialVersionUID = 5241258108364232643L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java
index 04cc2affcc24..2d0348a4a883 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/E.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5856959991514993164L;
+    private static final long serialVersionUID = 327893198627727808L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java
index b34e73630ffb..66a1e4e475e5 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8927547524804557170L;
+    private static final long serialVersionUID = -8566291679402167730L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java
index 4e7451757e6c..140fe7752405 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6534606963899876590L;
+    private static final long serialVersionUID = -4420856550019248046L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java
index 5a5a7e71880d..5a4a3548db5e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225292361791548339L;
+    private static final long serialVersionUID = -6225278022547473097L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java
index 5741da05528a..2668f3499283 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1207101281412108692L;
+    private static final long serialVersionUID = -2315866523294834156L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java
index 2c832dec9c97..c7257008c012 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -475950099614225775L;
+    private static final long serialVersionUID = 3340108225992702289L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java
index 199aa2b12ebf..5d28c3e4b85b 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6192372547220476379L;
+    private static final long serialVersionUID = 6192372363814447687L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java
index a9a3e090aedc..fbf82871212d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/F3.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 154865238143681860L;
+    private static final long serialVersionUID = 1706836727214600768L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java
index 4cd9a707cde7..781ed8e68e6a 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1425261159726051178L;
+    private static final long serialVersionUID = -1425250787868625709L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java
index 39a3ef51a75a..3eadb5597b2f 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337229322330651317L;
+    private static final long serialVersionUID = -2337227296095778998L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java
index aafc1515405b..c5164de4e497 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1298679063197932557L;
+    private static final long serialVersionUID = -1298690842753211534L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java
index cb6b5a3ae997..3c8ea3af51bf 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842238307267628015L;
+    private static final long serialVersionUID = 1842229588641070702L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java
index 0aa6435bfb15..3e72536c5158 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/K.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4645161787272243152L;
+    private static final long serialVersionUID = 4645163813585238161L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java
index 0588bc80c785..2874d2fd2de8 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/L.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6629739002711459449L;
+    private static final long serialVersionUID = 6629739871942825208L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java
index 01b98d878fd4..08eb2ad434ee 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/M.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8088097125737213205L;
+    private static final long serialVersionUID = -8088104607210866916L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java
index 4a1aea14488d..2bb121d42f61 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Recursive.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3617877552082215822L;
+    private static final long serialVersionUID = 3617890488716896331L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java
index 4cf4fa650f1a..b04a63e18494 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/S.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 481771819203030602L;
+    private static final long serialVersionUID = 481776570439982923L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java
index 1987054c1551..4f827ca9e8ae 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/SOneMember.java
@@ -142,5 +142,5 @@ static public java.util.Optional<SOneMember> ice_read(com.zeroc.Ice.InputStream
     private static final SOneMember _nullMarshalValue = new SOneMember();
 
     /** @hidden */
-    private static final long serialVersionUID = 6227753460784392923L;
+    private static final long serialVersionUID = 6227747301854681505L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java
index a52e7118d416..12a4bcb7d216 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/STwoMembers.java
@@ -155,5 +155,5 @@ static public java.util.Optional<STwoMembers> ice_read(com.zeroc.Ice.InputStream
     private static final STwoMembers _nullMarshalValue = new STwoMembers();
 
     /** @hidden */
-    private static final long serialVersionUID = -81413351427021822L;
+    private static final long serialVersionUID = -4782309714429892478L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java
index 01e8b3650df3..9d69b8bab343 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/StructKey.java
@@ -153,5 +153,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = 8117171757559071808L;
+    private static final long serialVersionUID = 1197302922882392844L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java
index f4dc753ca5a6..797787404e66 100644
--- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java
+++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/AnotherStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<AnotherStruct> ice_read(com.zeroc.Ice.InputStre
     private static final AnotherStruct _nullMarshalValue = new AnotherStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2723841491523047636L;
+    private static final long serialVersionUID = 2723843680691744391L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java
index 08a4a1d767d8..bc1130d2538d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyClass1.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7280885475397411538L;
+    private static final long serialVersionUID = 4742813821923568659L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java
index 465df1868f55..2a6e211abbf2 100644
--- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java
+++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct.java
@@ -148,5 +148,5 @@ static public java.util.Optional<MyStruct> ice_read(com.zeroc.Ice.InputStream is
     private static final MyStruct _nullMarshalValue = new MyStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -7434660442661359715L;
+    private static final long serialVersionUID = 6024321505615032733L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java
index 9da3f855924e..542fc07462ea 100644
--- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/MyStruct1.java
@@ -170,5 +170,5 @@ static public java.util.Optional<MyStruct1> ice_read(com.zeroc.Ice.InputStream i
     private static final MyStruct1 _nullMarshalValue = new MyStruct1();
 
     /** @hidden */
-    private static final long serialVersionUID = -2631797903414422297L;
+    private static final long serialVersionUID = -7705326099965122982L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java
index a88c1db6ce53..6d22e835124c 100644
--- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java
+++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/AMD/Test/Structure.java
@@ -170,5 +170,5 @@ static public java.util.Optional<Structure> ice_read(com.zeroc.Ice.InputStream i
     private static final Structure _nullMarshalValue = new Structure();
 
     /** @hidden */
-    private static final long serialVersionUID = 165966417187954273L;
+    private static final long serialVersionUID = 5401826703818270322L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java
index 9bab20346ddd..fc76b88afc31 100644
--- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java
+++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/AnotherStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<AnotherStruct> ice_read(com.zeroc.Ice.InputStre
     private static final AnotherStruct _nullMarshalValue = new AnotherStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2723841495371399205L;
+    private static final long serialVersionUID = 2723847576815866432L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java
index cfac669db66c..f25d885eeba8 100644
--- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyClass1.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4715531763526162382L;
+    private static final long serialVersionUID = -5624970581441500937L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java
index b4456fc0f4e2..80cac89ad5b1 100644
--- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java
+++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct.java
@@ -148,5 +148,5 @@ static public java.util.Optional<MyStruct> ice_read(com.zeroc.Ice.InputStream is
     private static final MyStruct _nullMarshalValue = new MyStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -2495935277714044931L;
+    private static final long serialVersionUID = -6870118842185742691L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java
index 76da4e2d4532..67af9facb44f 100644
--- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/MyStruct1.java
@@ -170,5 +170,5 @@ static public java.util.Optional<MyStruct1> ice_read(com.zeroc.Ice.InputStream i
     private static final MyStruct1 _nullMarshalValue = new MyStruct1();
 
     /** @hidden */
-    private static final long serialVersionUID = 7497691304313005275L;
+    private static final long serialVersionUID = -5906775310509277154L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java
index 2ccc7c615986..6ada4de616d2 100644
--- a/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java
+++ b/slice2java/java/test/src/main/java/test/Ice/operations/test/Ice/operations/Test/Structure.java
@@ -170,5 +170,5 @@ static public java.util.Optional<Structure> ice_read(com.zeroc.Ice.InputStream i
     private static final Structure _nullMarshalValue = new Structure();
 
     /** @hidden */
-    private static final long serialVersionUID = 1298859645949530098L;
+    private static final long serialVersionUID = -6920734436421532233L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java
index 1b769bb045ab..6742e35fd602 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/A.java
@@ -212,7 +212,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1619414739190463216L;
+    private static final long serialVersionUID = -799444859516832624L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java
index 336d4e9b0633..e8d2fc20e23e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/B.java
@@ -107,7 +107,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -153861340225053853L;
+    private static final long serialVersionUID = -1159023880958096925L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java
index 8a3d96454b5c..3b8985aaeddd 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/C.java
@@ -110,7 +110,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6554055172042482813L;
+    private static final long serialVersionUID = 3127287028974585725L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java
index d227bf953452..662ae056adf5 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8675157754681592569L;
+    private static final long serialVersionUID = -451233736506462843L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java
index 2220c211c8d2..1f42c1e6bb56 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/E.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1850740650961851057L;
+    private static final long serialVersionUID = -1850742761127806539L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java
index 9a239180eebe..c5058cd70a39 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/F.java
@@ -105,7 +105,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6430496769068233412L;
+    private static final long serialVersionUID = -6430489208759840442L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java
index 8bf5cb0ea7d6..35bba20b1434 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/FixedStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<FixedStruct> ice_read(com.zeroc.Ice.InputStream
     private static final FixedStruct _nullMarshalValue = new FixedStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 1569605461500077237L;
+    private static final long serialVersionUID = 1569605009492867432L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java
index 5a722ec40710..5007ce12d5af 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G.java
@@ -168,7 +168,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8250728210408959661L;
+    private static final long serialVersionUID = 5855679977255806931L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java
index 9d63f12edc41..307b38d11ac3 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<G1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G1 _nullMarshalValue = new G1();
 
     /** @hidden */
-    private static final long serialVersionUID = 7339780681132290295L;
+    private static final long serialVersionUID = 7339781298697214603L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java
index 846cd499fe7f..81c6cd917cf4 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/G2.java
@@ -138,5 +138,5 @@ static public java.util.Optional<G2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G2 _nullMarshalValue = new G2();
 
     /** @hidden */
-    private static final long serialVersionUID = 3824549962372414137L;
+    private static final long serialVersionUID = 3824547852215701833L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java
index 275d095c3c1e..b45d1d9b254e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/MultiOptional.java
@@ -1657,7 +1657,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1709596295993819219L;
+    private static final long serialVersionUID = -8761138490125498696L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java
index 518dd95eeab1..22de4011e433 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OneOptional.java
@@ -96,7 +96,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7219600576029185701L;
+    private static final long serialVersionUID = -7219601363832441594L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java
index f9442b4e6075..b5799447af4b 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3070021566826048570L;
+    private static final long serialVersionUID = -6826460432088117340L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java
index f51310d990de..46671d103ebb 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalWithCustom.java
@@ -150,7 +150,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7738632621592800389L;
+    private static final long serialVersionUID = -7216594260427896261L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java
index 8582f22b772f..18396d044167 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894242802098921726L;
+    private static final long serialVersionUID = 2894235407090584514L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java
index a7a79b295a60..71fa485b3a4b 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/SmallStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<SmallStruct> ice_read(com.zeroc.Ice.InputStream
     private static final SmallStruct _nullMarshalValue = new SmallStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 6700983809665093261L;
+    private static final long serialVersionUID = 6700991370128479945L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java
index 63539b4b3b9e..d9336d350bb7 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/VarStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<VarStruct> ice_read(com.zeroc.Ice.InputStream i
     private static final VarStruct _nullMarshalValue = new VarStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -1912288186451854721L;
+    private static final long serialVersionUID = -1912287568886946813L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java
index 4694486444d4..5ae7fe908a70 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/WD.java
@@ -152,7 +152,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2694182247879490292L;
+    private static final long serialVersionUID = 6991701155218982157L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java
index eface3ee5319..ecfea4e90a50 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/A.java
@@ -212,7 +212,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1677415968859640944L;
+    private static final long serialVersionUID = 8232199945476308496L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java
index d35f638d5069..947b964ba669 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/B.java
@@ -107,7 +107,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5152117853221996765L;
+    private static final long serialVersionUID = -6469736448028064797L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java
index a7d739579b4a..a0f530a78489 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/C.java
@@ -110,7 +110,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 374339346358971773L;
+    private static final long serialVersionUID = -2011870241333654467L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java
index b9820bda1cbd..5afa648c99a9 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5528535652961901169L;
+    private static final long serialVersionUID = -8482009609044183200L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java
index 74da401c5b6f..6c519f05295e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/E.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1850740654819497050L;
+    private static final long serialVersionUID = -1850732528848363887L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java
index 907ee34080fd..db9e30c50922 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/F.java
@@ -105,7 +105,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6430496770229133995L;
+    private static final long serialVersionUID = -6430494301162790942L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java
index a8a5a15ec0c9..66a2a825c069 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/FixedStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<FixedStruct> ice_read(com.zeroc.Ice.InputStream
     private static final FixedStruct _nullMarshalValue = new FixedStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 1569605462724387086L;
+    private static final long serialVersionUID = 1569613544713449537L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java
index 0a56caafdf9b..b252ec6c5a6d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G.java
@@ -168,7 +168,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1452032937850184237L;
+    private static final long serialVersionUID = -6505490201742191533L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java
index 5d697d5f0591..205877599527 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<G1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G1 _nullMarshalValue = new G1();
 
     /** @hidden */
-    private static final long serialVersionUID = 7339780679853237503L;
+    private static final long serialVersionUID = 7339783353237960878L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java
index 35491f7e7105..806eab8eba5d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/G2.java
@@ -138,5 +138,5 @@ static public java.util.Optional<G2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G2 _nullMarshalValue = new G2();
 
     /** @hidden */
-    private static final long serialVersionUID = 3824549958526465801L;
+    private static final long serialVersionUID = 3824558084489991734L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java
index f4dfd1b7f7eb..1ac94ec34b77 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/MultiOptional.java
@@ -1657,7 +1657,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2887278673195343126L;
+    private static final long serialVersionUID = -8410284887121707452L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java
index 9c7ad99c7637..c70545245d01 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OneOptional.java
@@ -96,7 +96,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7219600579833044960L;
+    private static final long serialVersionUID = -7219608698146688785L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java
index 88727352db26..73111899c7da 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8557079446741596134L;
+    private static final long serialVersionUID = -5043800772554226195L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java
index 2f312909333a..0cba3f221388 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalWithCustom.java
@@ -150,7 +150,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9174074821794559429L;
+    private static final long serialVersionUID = 8696210140249066299L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java
index 571940c7f442..b267fc02e573 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894242803249176310L;
+    private static final long serialVersionUID = 2894245474204577959L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java
index cfbccf41ca4e..52c12d27df45 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/SmallStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<SmallStruct> ice_read(com.zeroc.Ice.InputStream
     private static final SmallStruct _nullMarshalValue = new SmallStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 6700983808356198529L;
+    private static final long serialVersionUID = 6700991892885803240L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java
index c1819690f3a1..eda71514ade5 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/VarStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<VarStruct> ice_read(com.zeroc.Ice.InputStream i
     private static final VarStruct _nullMarshalValue = new VarStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -1912288187730366345L;
+    private static final long serialVersionUID = -1912285514346200538L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java
index 587924e50dda..7bb0ecae2f3c 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/WD.java
@@ -152,7 +152,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4951667575289925215L;
+    private static final long serialVersionUID = 8647723556967861345L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java
index 77e12290eba3..33a343614d2c 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1894600731124798597L;
+    private static final long serialVersionUID = 1894608796424717666L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java
index d13e103b4331..cee85d8e39b2 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/C2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2892572169372026316L;
+    private static final long serialVersionUID = 2892574694265158379L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java
index 7d72eb665602..2c1743202f2a 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5787340503934859914L;
+    private static final long serialVersionUID = 5787332438795659949L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java
index e51e7b9f370f..48c1e37f4696 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4908744899286658710L;
+    private static final long serialVersionUID = 4908753049814255025L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java
index 62517f683105..db9cad270279 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4322846293296286205L;
+    private static final long serialVersionUID = 4322854358444686042L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java
index 37491b385012..1d98dabd8163 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5832348531304947015L;
+    private static final long serialVersionUID = 5832349946923375981L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java
index cd98bf687103..46cb7ec5e517 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/C2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2769379529836895263L;
+    private static final long serialVersionUID = 2769372974141302616L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java
index a52cb02adb4d..b8af582a2a2f 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5344587581310519560L;
+    private static final long serialVersionUID = 5344586039282225250L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java
index f6b86b50056b..393d751a829b 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8399044274252385465L;
+    private static final long serialVersionUID = -8399050956243542400L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java
index 6cf3623b4b04..f68541cfe3b7 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -860911984570579962L;
+    private static final long serialVersionUID = -860918666612929812L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java
index 5f1691f8cc3a..f58ad3b3ba3c 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/C2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 954151524827427007L;
+    private static final long serialVersionUID = 954150254127098744L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java
index 58749dd58864..8ce00830308e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6934987302261014953L;
+    private static final long serialVersionUID = 6934988407732924739L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java
index 2bf9196f1e3b..92cf1de4b360 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5414540379055985766L;
+    private static final long serialVersionUID = 5414536344571791265L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java
index bae88583c230..5098d5d8d8d6 100644
--- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java
+++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5190249729000546413L;
+    private static final long serialVersionUID = -5190250219580519798L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java
index dd49b6a835aa..01d9c7884f34 100644
--- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8893230703133595345L;
+    private static final long serialVersionUID = 8893230181240603080L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java
index f219ee1cfad8..3f5a1a181cf8 100644
--- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/C2.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 904176784809227603L;
+    private static final long serialVersionUID = 2730857667203701834L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java
index 96bc241d0105..354d36e5d135 100644
--- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java
+++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4615625379023747397L;
+    private static final long serialVersionUID = 4615625867118175004L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java
index 48ed9582a348..cb5f7b07ed05 100644
--- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java
+++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 672580839147420023L;
+    private static final long serialVersionUID = 672580480038770798L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java
index 2433b124b614..e86082890067 100644
--- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java
+++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/Inner2/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 8654441931573570049L;
+    private static final long serialVersionUID = 8654442453467142680L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java
index a3bb3a0c1c06..ed6f7bcb7458 100644
--- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java
+++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/Inner/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 3694613529832460621L;
+    private static final long serialVersionUID = 3694613204559846100L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java
index c80119199e32..cee29c20626e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java
+++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 2159705275112144691L;
+    private static final long serialVersionUID = 2159705597806566954L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java
index c348f9662bd7..a2d610b3b23b 100644
--- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = 1241671621723783272L;
+    private static final long serialVersionUID = 1241671818005710065L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java
index 6fc91caaf5e2..857434b84ab4 100644
--- a/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/scope/test/Ice/scope/Test/S2.java
@@ -170,5 +170,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = -891647923321146326L;
+    private static final long serialVersionUID = -7956508842119473101L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java
index 07573ffe18cf..91f85c7bf616 100644
--- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java
+++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java
@@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1210109470201773L;
+    private static final long serialVersionUID = -4614739931117753482L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java
index 1c57c24fe34c..68e4abc488ea 100644
--- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java
+++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Baz.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5169490753188189230L;
+    private static final long serialVersionUID = -4942696323562607561L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java
index 0bbef6a92e64..8676d35df92d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java
+++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Foo.java
@@ -152,5 +152,5 @@ static public java.util.Optional<Foo> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final Foo _nullMarshalValue = new Foo();
 
     /** @hidden */
-    private static final long serialVersionUID = 3386624487442874084L;
+    private static final long serialVersionUID = 7333740591451769281L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java
index 95abfa3f571c..fb3e443abe84 100644
--- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java
+++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java
@@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2025051126517040242L;
+    private static final long serialVersionUID = -6439717978497881627L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java
index 87b192e8fa06..63503bb37272 100644
--- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java
+++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Baz.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -177834082574216525L;
+    private static final long serialVersionUID = -319306684896778716L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java
index 00413cf169f9..545d64da61b3 100644
--- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java
+++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Foo.java
@@ -152,5 +152,5 @@ static public java.util.Optional<Foo> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final Foo _nullMarshalValue = new Foo();
 
     /** @hidden */
-    private static final long serialVersionUID = 6654233587406242117L;
+    private static final long serialVersionUID = 7065271077635661394L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java
index f1c53a07c510..4bf8e55bd51e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477021392226534285L;
+    private static final long serialVersionUID = -477019891536159239L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java
index d1e33acbf518..102633a8d6a2 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485211378215362197L;
+    private static final long serialVersionUID = 3485213204355674143L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java
index 6c6c95378fd0..e617c8dd7b9c 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717374823111984100L;
+    private static final long serialVersionUID = 1717374004316695662L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java
index 30c986e17006..755bb05ca2c4 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384920925232250115L;
+    private static final long serialVersionUID = -7384914325835523593L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java
index 1bb2adfd5734..d069c0e436f4 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2733698541436524680L;
+    private static final long serialVersionUID = -2733711283064101902L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java
index 8bc4c8c2a781..c95a575473cd 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4528103948521517809L;
+    private static final long serialVersionUID = 4528099988876128763L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java
index bb040028bd76..83eebe7f6d34 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477022897913711259L;
+    private static final long serialVersionUID = -477024422002316921L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java
index 7cc4bfa9f06f..0f9b168bd278 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485209552073935619L;
+    private static final long serialVersionUID = 3485213803747491617L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java
index 2ffd7ab27fae..f98af4fc5293 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717377176153929202L;
+    private static final long serialVersionUID = 1717378534782976208L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java
index 9a96c698532e..f7c0d4d708dc 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384912357487646869L;
+    private static final long serialVersionUID = -7384919176594925431L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java
index 3d6615db27d0..19447834a140 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424370201655903974L;
+    private static final long serialVersionUID = 3424382470606353092L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java
index 52965c19fd0c..56b00ab749b7 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172598498962184969L;
+    private static final long serialVersionUID = -1172594407748061419L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java
index 7c2e16acbbf7..7b8407fd561f 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126113905583796082L;
+    private static final long serialVersionUID = -1126112376495064212L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java
index 5ff5cf498fc2..07e0632d34ce 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097583535761772306L;
+    private static final long serialVersionUID = -2097571266811323188L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java
index b52554239ca2..dd820b809faf 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477021214004379777L;
+    private static final long serialVersionUID = -477016922538832264L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java
index fe96b3b9a778..8f54e7f63597 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485211881878536857L;
+    private static final long serialVersionUID = 3485210232756597662L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java
index 6b3d408a4845..2748e54f9016 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717375326765958888L;
+    private static final long serialVersionUID = 1717371035300411375L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java
index 7202ba91d488..f2df0f8c9ff7 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384921103454404623L;
+    private static final long serialVersionUID = -7384917292406316682L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java
index 672ef987c39f..1bd02b67bf56 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424380225860851196L;
+    private static final long serialVersionUID = 3424376254679934971L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java
index a71cc0db89a5..3852f1a727a0 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172597938485084307L;
+    private static final long serialVersionUID = -1172593807152365078L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java
index 4665f1435046..4968b11470b9 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126109171060911084L;
+    private static final long serialVersionUID = -1126107682081000045L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java
index 47aadd9b9b58..dc2df4650083 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097573511537884172L;
+    private static final long serialVersionUID = -2097577482718800397L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java
index 7c3bbab15efa..045831966810 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/B.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7418720984477309431L;
+    private static final long serialVersionUID = -7369555141850995236L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java
index 0e8f7959d10e..921c0b3cd454 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1139382463329575995L;
+    private static final long serialVersionUID = -2673319364263184112L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java
index 91fbf620bee5..524eaebd22ca 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6396993668121647742L;
+    private static final long serialVersionUID = -6397005242257626203L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java
index e159ef390c11..c08de724d31a 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/CompactPDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9066889322394054188L;
+    private static final long serialVersionUID = -9066883368726747011L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java
index 44023e860d01..dd263b5511d5 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D1.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2513798146357127500L;
+    private static final long serialVersionUID = 3973669237534412415L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java
index 91fee9362f95..cfc9ef66f9bf 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/D3.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4017537271431669878L;
+    private static final long serialVersionUID = 6600883820868566845L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java
index 05f240397910..d3d35a82c3f4 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1893696179648912283L;
+    private static final long serialVersionUID = 4420761267925217099L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java
index 141e79b28c2a..c5dda3ee192d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Forward.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7655931127944425849L;
+    private static final long serialVersionUID = -7655926496593720377L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java
index 4ad8221916ed..7918853b5482 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Hidden.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2271120731925205303L;
+    private static final long serialVersionUID = -2271125363119985444L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java
index 522d2117dbfa..3b077f9b504f 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PBase.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 481717226458522688L;
+    private static final long serialVersionUID = 481705652237994975L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java
index 1e94fed9562c..83d50f2ebd55 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4426878860260603070L;
+    private static final long serialVersionUID = -4426884813927980443L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java
index b630a3d16a30..e5063914f883 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 850535860709360029L;
+    private static final long serialVersionUID = 850536364466457474L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java
index f1a942bab775..cca16e7a9417 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCDerived3.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4328906809040789932L;
+    private static final long serialVersionUID = -4328902177630177743L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java
index 07b8559894bb..4b3155ecfa49 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PCUnknown.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5081810392786749921L;
+    private static final long serialVersionUID = -5081815189308147452L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java
index 94897ca3fd50..aedb45eb8849 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 643087501828038099L;
+    private static final long serialVersionUID = 643077415463107002L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java
index 66cbbe807388..c7f74debb74e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/PNode.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2438005219464678514L;
+    private static final long serialVersionUID = -2438005557916371999L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java
index d73933820ae4..e3febdfe33d4 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/Preserved.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3651536701321659222L;
+    private static final long serialVersionUID = 3651532070126989645L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java
index 4217780232da..0c1364a7d91f 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBSKnownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8804373705589818867L;
+    private static final long serialVersionUID = 8804374209262308840L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java
index 68acc3254e65..218d9cd71936 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SBase.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5353758574739405563L;
+    private static final long serialVersionUID = -5353764533553620706L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java
index e84ffb99c223..90974d5fd2c2 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6522143241403599425L;
+    private static final long serialVersionUID = -6522131667178476000L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java
index 3d2da79c5011..ebe9de488571 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS2.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7620284843239669500L;
+    private static final long serialVersionUID = 7620290636697907299L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java
index 8b5478d3641e..5d3e49822bca 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/SS3.java
@@ -155,5 +155,5 @@ static public java.util.Optional<SS3> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final SS3 _nullMarshalValue = new SS3();
 
     /** @hidden */
-    private static final long serialVersionUID = -3838102294167925093L;
+    private static final long serialVersionUID = 1925858208615826207L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java
index 333c041d90e1..57dcc0756f06 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/B.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8717503773201626039L;
+    private static final long serialVersionUID = 7245131608695843164L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java
index bd04516fd99f..e82b41ffd325 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6567084366408434181L;
+    private static final long serialVersionUID = -977909970115224176L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java
index 205ed1d6d894..eaca57cb6a98 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/CompactPDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9066881019465838857L;
+    private static final long serialVersionUID = -9066886136271373090L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java
index 8ffa8feb3c51..75ecb73505b1 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D1.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6140930276443751316L;
+    private static final long serialVersionUID = 4138767776792332255L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java
index 79faa1e9968b..7698a2da19a7 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D2.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4915159176652798071L;
+    private static final long serialVersionUID = -650233653340208196L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java
index 8c8a118d4ce5..579b2ba83ed4 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/D4.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3891170576207596429L;
+    private static final long serialVersionUID = 6219549480689426163L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java
index 1f90a94962ad..d95c757616c1 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6197740652776413819L;
+    private static final long serialVersionUID = 7996277253677435819L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java
index dd36d0705603..b21a0340f885 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Forward.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7655922905092069439L;
+    private static final long serialVersionUID = -7655929344507916929L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java
index e6ac20388b3f..769fa1ce7297 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Hidden.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2271128954927158742L;
+    private static final long serialVersionUID = -2271122680966127681L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java
index c7931dc24ae5..2f50ca1e5543 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/MyClass.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4147528855810034924L;
+    private static final long serialVersionUID = 4147522416446903667L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java
index 7f1754a2f658..d216d169c23f 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PBase.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 481708672992704291L;
+    private static final long serialVersionUID = 481719245021169596L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java
index f928ce8f54fb..6c2198403088 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 643079529515483312L;
+    private static final long serialVersionUID = 643091258637174745L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java
index b665f4fc8be1..73f54d9a5f21 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PNode.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2438007907085492819L;
+    private static final long serialVersionUID = -2438008405610282942L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java
index 297a15cd3e11..88a075127b79 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2863434379234960849L;
+    private static final long serialVersionUID = 6773056929978134694L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java
index 97f36cffb80b..6079bbf83a9e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknown2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8813709564912057772L;
+    private static final long serialVersionUID = -8813714521566152707L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java
index d099b7cad733..e83cc95d3ec7 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java
@@ -61,5 +61,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4410691221336497589L;
+    private static final long serialVersionUID = 4410697495444590469L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java
index 7635fd59db06..f50ca754e34d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/Preserved.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3651528478471357749L;
+    private static final long serialVersionUID = 3651534752432508078L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java
index 56d43133ff65..045a0fc30841 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSKnownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8804376643752903440L;
+    private static final long serialVersionUID = 8804377142259806859L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java
index 81083f014289..872048eb86eb 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBSUnknownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4989067242344505899L;
+    private static final long serialVersionUID = -4989055347914889650L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java
index 8771feabc6dd..974429eae9cd 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SBase.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5353761262362443610L;
+    private static final long serialVersionUID = -5353756470997435075L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java
index 6133c040e850..112513d1365a 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6522134938480055908L;
+    private static final long serialVersionUID = -6522145345048966909L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java
index a16f095810f9..688a5b28f5a7 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS2.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7620287450789604639L;
+    private static final long serialVersionUID = 7620282659528029184L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java
index b2ed5efa77cb..9c275884895c 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SS3.java
@@ -155,5 +155,5 @@ static public java.util.Optional<SS3> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final SS3 _nullMarshalValue = new SS3();
 
     /** @hidden */
-    private static final long serialVersionUID = -3909686003637538789L;
+    private static final long serialVersionUID = -4333473656475514465L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java
index a794013d39f4..916fe874c180 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/SUnknown.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5561120463228006581L;
+    private static final long serialVersionUID = -2710887475995079064L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java
index 517353577e6c..17275a025b67 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5035332598502752521L;
+    private static final long serialVersionUID = -1667789883451001451L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java
index 8d1d615ff093..dd41e6dfc461 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/B.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5838270135559819252L;
+    private static final long serialVersionUID = 496443069254170558L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java
index d68ba57405b2..52fd2e2b4751 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 46566642356068920L;
+    private static final long serialVersionUID = -8074876870421445902L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java
index 958ce0ad8b2b..9ff05d2764c3 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D1.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2880826489038649143L;
+    private static final long serialVersionUID = -5677383295048516323L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java
index df8b760677a3..6a698e82476e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D2.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5963070506616650260L;
+    private static final long serialVersionUID = -6903156874598196226L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java
index ae8205b9c679..94f2625dd5aa 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/D4.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5176328931940207603L;
+    private static final long serialVersionUID = 3458196103635090035L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java
index 94f390dbdecb..62ab6ec5df3c 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2015821435240610798L;
+    private static final long serialVersionUID = -4163131377199339773L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java
index 472d5932ac99..1e51e0688ed0 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Forward.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7655926512242450579L;
+    private static final long serialVersionUID = -7655918937697657597L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java
index dae3c2a82fa1..ff51f748d19d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Hidden.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2271125347512524755L;
+    private static final long serialVersionUID = -2271132922321204807L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java
index 7fde05f21c0c..819ec163fac1 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/MyClass.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4147525248659634617L;
+    private static final long serialVersionUID = 4147532823100174375L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java
index 00ff7fdaa13d..ae4a0d432ded 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PBase.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 481705794390890358L;
+    private static final long serialVersionUID = 481704705666880488L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java
index b44c929d79fe..cf18064784e9 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 643077433655303297L;
+    private static final long serialVersionUID = 643078207047794905L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java
index 212da8ad2b68..7c2eaef60671 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PNode.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2438005738744720649L;
+    private static final long serialVersionUID = -2438003939709452730L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java
index 3868681527c0..998b833aef5d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -643021551749203719L;
+    private static final long serialVersionUID = -2809636774096610224L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java
index 8d7125bcc7f1..52c064033e6a 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknown2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8813706190266289755L;
+    private static final long serialVersionUID = -8813705432209984771L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java
index af9a1a172f27..c859bcb28634 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java
@@ -61,5 +61,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4410694916305238679L;
+    private static final long serialVersionUID = 4410695354026513682L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java
index f3b5b8b393e2..bf75fd3d0399 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/Preserved.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3651532085775764226L;
+    private static final long serialVersionUID = 3651524511095708729L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java
index b92bde991f1c..21bc9e38fde0 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSKnownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8804374227482436775L;
+    private static final long serialVersionUID = 8804375321294725148L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java
index 2eac226753fa..59447cf37eaf 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBSUnknownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4989069085343407582L;
+    private static final long serialVersionUID = -4989065754559453863L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java
index 82efd0e70137..6af5a8f36f2f 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SBase.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5353764549212160431L;
+    private static final long serialVersionUID = -5353757294958891094L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java
index 869d9227fa05..52160a88b983 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6522131811911987618L;
+    private static final long serialVersionUID = -6522133615926862429L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java
index 27d55e0925a6..22c7403a3095 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS2.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7620290820305379293L;
+    private static final long serialVersionUID = 7620286128404616928L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java
index a2718096564d..826c0c2f9bd2 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SS3.java
@@ -155,5 +155,5 @@ static public java.util.Optional<SS3> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final SS3 _nullMarshalValue = new SS3();
 
     /** @hidden */
-    private static final long serialVersionUID = 6661449624767790277L;
+    private static final long serialVersionUID = 1588479225663055130L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java
index 97abc7bd8666..932e11b5d670 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/SUnknown.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5307102780145695588L;
+    private static final long serialVersionUID = 3168509730523076786L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java
index a69626d2baf0..ab9ade8fd55c 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6529509553798423965L;
+    private static final long serialVersionUID = -6280347956742997452L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java
index 8a0f5bffd687..2a54eff41b09 100644
--- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java
+++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/LargeStruct.java
@@ -253,5 +253,5 @@ static public java.util.Optional<LargeStruct> ice_read(com.zeroc.Ice.InputStream
     private static final LargeStruct _nullMarshalValue = new LargeStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -4369935953302038239L;
+    private static final long serialVersionUID = 3913686412462708268L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java
index 91a37a36e3be..b4795793c6aa 100644
--- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java
+++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyClass.java
@@ -88,7 +88,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7692016895795723232L;
+    private static final long serialVersionUID = -1204575938730381107L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java
index 0399b81d56d3..91c87f18eaca 100644
--- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734225902585421211L;
+    private static final long serialVersionUID = 5734227040454156182L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java
index dc3a042f5f81..39745d4e2ee5 100644
--- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java
+++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/OptionalClass.java
@@ -726,7 +726,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8808767696151141008L;
+    private static final long serialVersionUID = -6167368368436337667L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java
index 89355f0d4a3b..9b0ed9b59665 100644
--- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java
+++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/Point.java
@@ -148,5 +148,5 @@ static public java.util.Optional<Point> ice_read(com.zeroc.Ice.InputStream istr,
     private static final Point _nullMarshalValue = new Point();
 
     /** @hidden */
-    private static final long serialVersionUID = 7753866211698221968L;
+    private static final long serialVersionUID = -4165936069090202448L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java
index ea9e6fc54701..5b253669704f 100644
--- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java
+++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Cls.java
@@ -172,7 +172,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2023039696528600261L;
+    private static final long serialVersionUID = 3680897674721351571L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java
index b7bd8295a97b..a4da47e569e1 100644
--- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5284207791450885588L;
+    private static final long serialVersionUID = -2626791897291134088L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java
index 5bc34cd93c47..e7ebbe633e0d 100644
--- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java
+++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/St.java
@@ -197,5 +197,5 @@ static public java.util.Optional<St> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final St _nullMarshalValue = new St();
 
     /** @hidden */
-    private static final long serialVersionUID = 7850857413428577012L;
+    private static final long serialVersionUID = -3293834425861433860L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java
index 2aa6920253fd..121782599fc7 100644
--- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java
+++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_break.java
@@ -138,5 +138,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr
     private static final _break _nullMarshalValue = new _break();
 
     /** @hidden */
-    private static final long serialVersionUID = -943479227912382083L;
+    private static final long serialVersionUID = -943483001748583801L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java
index 456456b7a9dd..6bbb53c41b5a 100644
--- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java
+++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_else.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5346220812155464445L;
+    private static final long serialVersionUID = -3769294922855740952L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java
index df8ee9cf3240..baf64e1ccfa1 100644
--- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java
+++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2944657304644791546L;
+    private static final long serialVersionUID = -2944659306267717508L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java
index 3447759ec95e..800822605ed3 100644
--- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java
+++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7368687609686789175L;
+    private static final long serialVersionUID = 2400673574569686775L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java
index c077be322fdd..147dcc207cd3 100644
--- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java
+++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/Default.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4084346193816285054L;
+    private static final long serialVersionUID = 203143331773012766L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java
index 562ca1aa7963..d5aa525b998e 100644
--- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java
+++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/JavaOnly.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -181964881226866674L;
+    private static final long serialVersionUID = 3787969432348043246L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java
index f324c0a2bc23..471e3aaa8a44 100644
--- a/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java
+++ b/slice2java/java/test/src/main/java/test/Slice/macros/test/Slice/macros/Test/NoDefault.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2908321731349719327L;
+    private static final long serialVersionUID = -4432839581116198273L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java
index fb8af9b7cb82..c7485dfe631a 100644
--- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java
+++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/C.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3172274612176862045L;
+    private static final long serialVersionUID = -3172279585697349193L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java
index 92f3a80863d7..16fd75eb1c48 100644
--- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java
+++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = -5542862038104663070L;
+    private static final long serialVersionUID = -5542850325857309322L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java
index 5fb9ccbab7bf..2c05359d1973 100644
--- a/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java
+++ b/slice2java/java/test/src/main/java/test/Slice/structure/test/Slice/structure/Test/S2.java
@@ -289,5 +289,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = -809343078144564397L;
+    private static final long serialVersionUID = -7539052248293151533L;
 }
diff --git a/slice2java/js/test/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/Glacier2/router/Test/CallbackException.java
index 53be16119e1a..17eb91765bac 100644
--- a/slice2java/js/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/js/test/Glacier2/router/Test/CallbackException.java
@@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5234777328349788311L;
+    private static final long serialVersionUID = 3659656015788986199L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Base.java b/slice2java/js/test/Ice/defaultValue/Test/Base.java
index 915d19d0e4c9..d97c24163f1c 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/Base.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/Base.java
@@ -106,7 +106,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3095489583980656695L;
+    private static final long serialVersionUID = 5267326485460390813L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java
index 4c14c168893d..f8c7913f91ba 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2411503483155008963L;
+    private static final long serialVersionUID = 4853666046934776105L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java
index acb8f2a462b2..a63651470563 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7530437640978154390L;
+    private static final long serialVersionUID = -5971909512961647074L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index dc9a1bb4761e..f322e18bf5a2 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2631756853695033263L;
+    private static final long serialVersionUID = 4442602554987141355L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/Ice/defaultValue/Test/Derived.java
index 3c0e4a5beef7..e892c0da695e 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/Derived.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/Derived.java
@@ -68,7 +68,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1034003283670152185L;
+    private static final long serialVersionUID = -6886540777237553665L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java
index 8deea9b91058..ff7d357d9b26 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java
@@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6746640430550559666L;
+    private static final long serialVersionUID = -4755721717667035064L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index 331507018611..05d46da0602e 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1533185589850443890L;
+    private static final long serialVersionUID = -3423069001208605574L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index eee153a34713..0624fb726efc 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
@@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7556491286702764959L;
+    private static final long serialVersionUID = 2748299532476479131L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java
index 60ac2f395169..b5616b870aa8 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<InnerStruct> ice_read(com.zeroc.Ice.InputStream
     private static final InnerStruct _nullMarshalValue = new InnerStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 5127393512769607815L;
+    private static final long serialVersionUID = 5127389002873562018L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java
index f01cb7aa6374..cf5d10ba42fa 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct1> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct1 _nullMarshalValue = new Struct1();
 
     /** @hidden */
-    private static final long serialVersionUID = 4598134443865342830L;
+    private static final long serialVersionUID = -1765235954997349726L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java
index ab943cc92097..f63659b172aa 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java
@@ -370,5 +370,5 @@ static public java.util.Optional<Struct2> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct2 _nullMarshalValue = new Struct2();
 
     /** @hidden */
-    private static final long serialVersionUID = 4453015824990659626L;
+    private static final long serialVersionUID = 7253099705632018634L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java
index e69a0759973e..4cfafb147d5a 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct3> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct3 _nullMarshalValue = new Struct3();
 
     /** @hidden */
-    private static final long serialVersionUID = 7930402925924334188L;
+    private static final long serialVersionUID = -4596846462276758624L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java
index 4f516d1cbd3f..ddd482088fc0 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java
@@ -274,5 +274,5 @@ static public java.util.Optional<StructNoDefaults> ice_read(com.zeroc.Ice.InputS
     private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults();
 
     /** @hidden */
-    private static final long serialVersionUID = 2646608192706419519L;
+    private static final long serialVersionUID = 6510485046080200996L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/A.java b/slice2java/js/test/Ice/exceptions/Test/A.java
index c6fb1e41403b..2c984d3f5d0a 100644
--- a/slice2java/js/test/Ice/exceptions/Test/A.java
+++ b/slice2java/js/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823744421931104407L;
+    private static final long serialVersionUID = 7823738530368010660L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/B.java b/slice2java/js/test/Ice/exceptions/Test/B.java
index 6c68749bc843..cfc4a96ac653 100644
--- a/slice2java/js/test/Ice/exceptions/Test/B.java
+++ b/slice2java/js/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861406021572007849L;
+    private static final long serialVersionUID = -3861417368295802652L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/C.java b/slice2java/js/test/Ice/exceptions/Test/C.java
index 928e817ca4d8..65daa5e5399f 100644
--- a/slice2java/js/test/Ice/exceptions/Test/C.java
+++ b/slice2java/js/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080698113133889687L;
+    private static final long serialVersionUID = 1080692221570795940L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/D.java b/slice2java/js/test/Ice/exceptions/Test/D.java
index d2c3da1539c5..4627c2dae764 100644
--- a/slice2java/js/test/Ice/exceptions/Test/D.java
+++ b/slice2java/js/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780386246530070359L;
+    private static final long serialVersionUID = 4780374899806275556L;
 }
diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/Ice/inheritance/Test/MC/A.java
index 9590f49cf7c7..b53a26b8a570 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MC/A.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MC/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 954229443115836301L;
+    private static final long serialVersionUID = 954231732933591170L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/B.java b/slice2java/js/test/Ice/inheritance/Test/MC/B.java
index 193ee4f93f2d..9772f5543b91 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MC/B.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MC/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1339633030211873815L;
+    private static final long serialVersionUID = 1339633958741865496L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/C.java b/slice2java/js/test/Ice/inheritance/Test/MC/C.java
index 49cee87ddb3c..5b1de26ffe49 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MC/C.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MC/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2729307090928168171L;
+    private static final long serialVersionUID = -2729306162398172134L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/D.java b/slice2java/js/test/Ice/inheritance/Test/MC/D.java
index 98af5fd9044f..82ee0102154d 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MC/D.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MC/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3435399149387697901L;
+    private static final long serialVersionUID = -3435409131179395812L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MD/A.java b/slice2java/js/test/Ice/inheritance/Test/MD/A.java
index a78c351f0a85..f97f54d7c37c 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MD/A.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MD/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -836181197486967670L;
+    private static final long serialVersionUID = -836176340240601979L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MD/B.java b/slice2java/js/test/Ice/inheritance/Test/MD/B.java
index 6871ee9a1353..602b87722a9f 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MD/B.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MD/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1132522158177001015L;
+    private static final long serialVersionUID = 1132528216256619832L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MD/C.java b/slice2java/js/test/Ice/inheritance/Test/MD/C.java
index 8fe32be108b6..607affb4b1a5 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MD/C.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MD/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6335555603117008075L;
+    private static final long serialVersionUID = -6335549545037384902L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MD/D.java b/slice2java/js/test/Ice/inheritance/Test/MD/D.java
index 0066095a452e..bbfc4baba4d8 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MD/D.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MD/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4007410525041110477L;
+    private static final long serialVersionUID = -4007415377283181252L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/ME/A.java b/slice2java/js/test/Ice/inheritance/Test/ME/A.java
index b5cbcc196513..caca458d1440 100644
--- a/slice2java/js/test/Ice/inheritance/Test/ME/A.java
+++ b/slice2java/js/test/Ice/inheritance/Test/ME/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 991428405939317131L;
+    private static final long serialVersionUID = 991419785435378052L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/ME/B.java b/slice2java/js/test/Ice/inheritance/Test/ME/B.java
index c119547dbfde..53f53fb5e44a 100644
--- a/slice2java/js/test/Ice/inheritance/Test/ME/B.java
+++ b/slice2java/js/test/Ice/inheritance/Test/ME/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2880334751609173033L;
+    private static final long serialVersionUID = -2880328698230545192L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/ME/C.java b/slice2java/js/test/Ice/inheritance/Test/ME/C.java
index e27351e2cd68..ec7056010530 100644
--- a/slice2java/js/test/Ice/inheritance/Test/ME/C.java
+++ b/slice2java/js/test/Ice/inheritance/Test/ME/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8808268088142638379L;
+    private static final long serialVersionUID = -8808272945085408294L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/ME/D.java b/slice2java/js/test/Ice/inheritance/Test/ME/D.java
index 84ddc7e621a9..a0b205da88d7 100644
--- a/slice2java/js/test/Ice/inheritance/Test/ME/D.java
+++ b/slice2java/js/test/Ice/inheritance/Test/ME/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -771853730651299373L;
+    private static final long serialVersionUID = -771858587594361124L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MF/A.java b/slice2java/js/test/Ice/inheritance/Test/MF/A.java
index 8b6addfe9b08..4fbc4848aa34 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MF/A.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MF/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6566354688816220808L;
+    private static final long serialVersionUID = 6566348635741188743L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MF/B.java b/slice2java/js/test/Ice/inheritance/Test/MF/B.java
index ea6776ccac2a..44ba1ab45c66 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MF/B.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MF/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6983798907997313783L;
+    private static final long serialVersionUID = 6983810421237773048L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MF/C.java b/slice2java/js/test/Ice/inheritance/Test/MF/C.java
index ee51ad0d9462..b0c78e50db81 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MF/C.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MF/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1175219947660387083L;
+    private static final long serialVersionUID = -1175219344741325574L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MF/D.java b/slice2java/js/test/Ice/inheritance/Test/MF/D.java
index 038033450345..a03eed695fc2 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MF/D.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MF/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3279718988237774349L;
+    private static final long serialVersionUID = -3279718385319004676L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MG/A.java b/slice2java/js/test/Ice/inheritance/Test/MG/A.java
index 6613ff398ba0..d41227e7fd27 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MG/A.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MG/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4359171967276753271L;
+    private static final long serialVersionUID = -4359180587780687994L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MG/B.java b/slice2java/js/test/Ice/inheritance/Test/MG/B.java
index 94e24227ea8a..15e2b3b964fd 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MG/B.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MG/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5904689817763261847L;
+    private static final long serialVersionUID = 5904690746293253528L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MG/C.java b/slice2java/js/test/Ice/inheritance/Test/MG/C.java
index 08ffe7c350a6..308cf53818df 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MG/C.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MG/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1835749696623219861L;
+    private static final long serialVersionUID = 1835750625153215898L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MG/D.java b/slice2java/js/test/Ice/inheritance/Test/MG/D.java
index c28bf0c3e2c2..923be0008478 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MG/D.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MG/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2252399802618015085L;
+    private static final long serialVersionUID = -2252409784409712996L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MH/A.java b/slice2java/js/test/Ice/inheritance/Test/MH/A.java
index 9a8b86ff6896..4d569a760d31 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MH/A.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MH/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1203539630140927098L;
+    private static final long serialVersionUID = -1203523862572855415L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MH/B.java b/slice2java/js/test/Ice/inheritance/Test/MH/B.java
index 6f52461ea52d..eb7ddff7c882 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MH/B.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MH/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7537769873410284105L;
+    private static final long serialVersionUID = -7537763815330665288L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MH/C.java b/slice2java/js/test/Ice/inheritance/Test/MH/C.java
index 562ee21b6739..17cf8a5d0f56 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MH/C.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MH/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3440896439005258421L;
+    private static final long serialVersionUID = 3440902497084881594L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/inheritance/Test/MH/D.java b/slice2java/js/test/Ice/inheritance/Test/MH/D.java
index 9bdbe88bc407..e3d84fdb6a61 100644
--- a/slice2java/js/test/Ice/inheritance/Test/MH/D.java
+++ b/slice2java/js/test/Ice/inheritance/Test/MH/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9151098957862861235L;
+    private static final long serialVersionUID = 9151094105620790460L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/A.java b/slice2java/js/test/Ice/objects/Test/A.java
index 96e97be3be87..d1d4f93caa5a 100644
--- a/slice2java/js/test/Ice/objects/Test/A.java
+++ b/slice2java/js/test/Ice/objects/Test/A.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3898405882500176958L;
+    private static final long serialVersionUID = -4935502380928967704L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/A1.java b/slice2java/js/test/Ice/objects/Test/A1.java
index 6b5e134776d6..89c1eb209776 100644
--- a/slice2java/js/test/Ice/objects/Test/A1.java
+++ b/slice2java/js/test/Ice/objects/Test/A1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5926743113947301876L;
+    private static final long serialVersionUID = -5926742955187365456L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/B.java b/slice2java/js/test/Ice/objects/Test/B.java
index 695a5e552656..bc72c2ed2108 100644
--- a/slice2java/js/test/Ice/objects/Test/B.java
+++ b/slice2java/js/test/Ice/objects/Test/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8890910184630391064L;
+    private static final long serialVersionUID = -8890910508813735125L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/B1.java b/slice2java/js/test/Ice/objects/Test/B1.java
index 378d5564c25f..86f6a9fa74af 100644
--- a/slice2java/js/test/Ice/objects/Test/B1.java
+++ b/slice2java/js/test/Ice/objects/Test/B1.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9153393744791498052L;
+    private static final long serialVersionUID = -1394536003663554556L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Base.java b/slice2java/js/test/Ice/objects/Test/Base.java
index 3d98fdc7b40c..a4a5413f21fd 100644
--- a/slice2java/js/test/Ice/objects/Test/Base.java
+++ b/slice2java/js/test/Ice/objects/Test/Base.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3522082025417602452L;
+    private static final long serialVersionUID = 907182847609443242L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/C.java b/slice2java/js/test/Ice/objects/Test/C.java
index c9d7b781da14..06b651ac6579 100644
--- a/slice2java/js/test/Ice/objects/Test/C.java
+++ b/slice2java/js/test/Ice/objects/Test/C.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8952536416370546491L;
+    private static final long serialVersionUID = -6614828649947231235L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/COneMember.java b/slice2java/js/test/Ice/objects/Test/COneMember.java
index 659ea032758b..122563967c19 100644
--- a/slice2java/js/test/Ice/objects/Test/COneMember.java
+++ b/slice2java/js/test/Ice/objects/Test/COneMember.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3050969040730767040L;
+    private static final long serialVersionUID = 3050969199345751035L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java
index 517c4d2126dc..a3855ea816ac 100644
--- a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java
+++ b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1728938789614029723L;
+    private static final long serialVersionUID = -290645434146649317L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/D.java b/slice2java/js/test/Ice/objects/Test/D.java
index ff1c210da822..38f3329065d4 100644
--- a/slice2java/js/test/Ice/objects/Test/D.java
+++ b/slice2java/js/test/Ice/objects/Test/D.java
@@ -57,7 +57,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4102415740273932594L;
+    private static final long serialVersionUID = 23445227668899335L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/D1.java b/slice2java/js/test/Ice/objects/Test/D1.java
index cf1cae82fbdb..7d61ce1e7088 100644
--- a/slice2java/js/test/Ice/objects/Test/D1.java
+++ b/slice2java/js/test/Ice/objects/Test/D1.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2592369817079507069L;
+    private static final long serialVersionUID = -8739146025277941181L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/E.java b/slice2java/js/test/Ice/objects/Test/E.java
index 108b8adfe4e7..7386be435aad 100644
--- a/slice2java/js/test/Ice/objects/Test/E.java
+++ b/slice2java/js/test/Ice/objects/Test/E.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6577838564310949572L;
+    private static final long serialVersionUID = 4551164969751914566L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/EBase.java b/slice2java/js/test/Ice/objects/Test/EBase.java
index 0868cf4c4501..75b2d681a19f 100644
--- a/slice2java/js/test/Ice/objects/Test/EBase.java
+++ b/slice2java/js/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 388356570981695502L;
+    private static final long serialVersionUID = -2120496923095169074L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/EDerived.java b/slice2java/js/test/Ice/objects/Test/EDerived.java
index 7105122863ed..b94a24658c19 100644
--- a/slice2java/js/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/js/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6438892672583516306L;
+    private static final long serialVersionUID = -7249624109163152430L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/EOneMember.java b/slice2java/js/test/Ice/objects/Test/EOneMember.java
index bfe9de77f8e8..df25056e3bdc 100644
--- a/slice2java/js/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/js/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225284184222146865L;
+    private static final long serialVersionUID = -6225284381729696460L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java
index 33235211b52c..0c67e9e5bf6d 100644
--- a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7211981811318836884L;
+    private static final long serialVersionUID = -4517797619243611756L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/F.java b/slice2java/js/test/Ice/objects/Test/F.java
index 22c108b1089e..b1cb0e4de405 100644
--- a/slice2java/js/test/Ice/objects/Test/F.java
+++ b/slice2java/js/test/Ice/objects/Test/F.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5274675927838197935L;
+    private static final long serialVersionUID = 1112120741303443985L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/F1.java b/slice2java/js/test/Ice/objects/Test/F1.java
index fae206b55bef..a85613ed1de0 100644
--- a/slice2java/js/test/Ice/objects/Test/F1.java
+++ b/slice2java/js/test/Ice/objects/Test/F1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6192376154216787274L;
+    private static final long serialVersionUID = 6192373493928183867L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/F3.java b/slice2java/js/test/Ice/objects/Test/F3.java
index 438ff3dea745..ceaea80b8cba 100644
--- a/slice2java/js/test/Ice/objects/Test/F3.java
+++ b/slice2java/js/test/Ice/objects/Test/F3.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -39251178641418591L;
+    private static final long serialVersionUID = -2146051702226014295L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Inner/A.java b/slice2java/js/test/Ice/objects/Test/Inner/A.java
index ed8cb6391c59..0edb69faa3a3 100644
--- a/slice2java/js/test/Ice/objects/Test/Inner/A.java
+++ b/slice2java/js/test/Ice/objects/Test/Inner/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1425258106685813630L;
+    private static final long serialVersionUID = -1425257909116546495L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Inner/Ex.java b/slice2java/js/test/Ice/objects/Test/Inner/Ex.java
index 043989a72a02..9b07c9e36ee6 100644
--- a/slice2java/js/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/js/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337226269288411723L;
+    private static final long serialVersionUID = -2337226753507894263L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java
index a10ba7465791..758c96cfe425 100644
--- a/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java
+++ b/slice2java/js/test/Ice/objects/Test/Inner/Sub/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1298687571244259876L;
+    private static final long serialVersionUID = -1298687208476280536L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java
index c680e3a29137..3a9a4afe5e79 100644
--- a/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842230129681126609L;
+    private static final long serialVersionUID = 1842229645471118125L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/K.java b/slice2java/js/test/Ice/objects/Test/K.java
index fd532845ea85..1ee9b5af52ca 100644
--- a/slice2java/js/test/Ice/objects/Test/K.java
+++ b/slice2java/js/test/Ice/objects/Test/K.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4645159064860216737L;
+    private static final long serialVersionUID = 4645159422665480169L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/L.java b/slice2java/js/test/Ice/objects/Test/L.java
index e206aa4667b2..ec669350e0a7 100644
--- a/slice2java/js/test/Ice/objects/Test/L.java
+++ b/slice2java/js/test/Ice/objects/Test/L.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6629747510913252423L;
+    private static final long serialVersionUID = 6629747147940035003L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/M.java b/slice2java/js/test/Ice/objects/Test/M.java
index cc58b7c9a0db..52790d362bfd 100644
--- a/slice2java/js/test/Ice/objects/Test/M.java
+++ b/slice2java/js/test/Ice/objects/Test/M.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8088105633933215573L;
+    private static final long serialVersionUID = -8088105991753487276L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Recursive.java b/slice2java/js/test/Ice/objects/Test/Recursive.java
index 6442efef32bc..3f5e573f2310 100644
--- a/slice2java/js/test/Ice/objects/Test/Recursive.java
+++ b/slice2java/js/test/Ice/objects/Test/Recursive.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3617886060273807679L;
+    private static final long serialVersionUID = 3617885736194528006L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/S.java b/slice2java/js/test/Ice/objects/Test/S.java
index afc5a812ba17..8e0437df5e3b 100644
--- a/slice2java/js/test/Ice/objects/Test/S.java
+++ b/slice2java/js/test/Ice/objects/Test/S.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 481774872240596468L;
+    private static final long serialVersionUID = 481774388021187720L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/SOneMember.java b/slice2java/js/test/Ice/objects/Test/SOneMember.java
index 8089e0cee1d9..6dbbcbf99557 100644
--- a/slice2java/js/test/Ice/objects/Test/SOneMember.java
+++ b/slice2java/js/test/Ice/objects/Test/SOneMember.java
@@ -142,5 +142,5 @@ static public java.util.Optional<SOneMember> ice_read(com.zeroc.Ice.InputStream
     private static final SOneMember _nullMarshalValue = new SOneMember();
 
     /** @hidden */
-    private static final long serialVersionUID = 6227744952596821721L;
+    private static final long serialVersionUID = 6227744633517256354L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/Ice/objects/Test/STwoMembers.java
index 16a8e49d9148..180370e4f2a0 100644
--- a/slice2java/js/test/Ice/objects/Test/STwoMembers.java
+++ b/slice2java/js/test/Ice/objects/Test/STwoMembers.java
@@ -155,5 +155,5 @@ static public java.util.Optional<STwoMembers> ice_read(com.zeroc.Ice.InputStream
     private static final STwoMembers _nullMarshalValue = new STwoMembers();
 
     /** @hidden */
-    private static final long serialVersionUID = -2975415498800936958L;
+    private static final long serialVersionUID = 1691965633971127554L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/StructKey.java b/slice2java/js/test/Ice/objects/Test/StructKey.java
index 303ed8752ff6..d96801e5aee4 100644
--- a/slice2java/js/test/Ice/objects/Test/StructKey.java
+++ b/slice2java/js/test/Ice/objects/Test/StructKey.java
@@ -153,5 +153,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = 8218698048345917704L;
+    private static final long serialVersionUID = -5376214910544264822L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java
index 9761d0d92254..132ea3315c27 100644
--- a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java
+++ b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<AnotherStruct> ice_read(com.zeroc.Ice.InputStre
     private static final AnotherStruct _nullMarshalValue = new AnotherStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2723846690800896934L;
+    private static final long serialVersionUID = 2723847871365363708L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/MyClass1.java b/slice2java/js/test/Ice/operations/Test/MyClass1.java
index 54973eabdd23..3b66203a0079 100644
--- a/slice2java/js/test/Ice/operations/Test/MyClass1.java
+++ b/slice2java/js/test/Ice/operations/Test/MyClass1.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8036655257826929208L;
+    private static final long serialVersionUID = -2353346168307440257L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct.java b/slice2java/js/test/Ice/operations/Test/MyStruct.java
index b472df25335b..a9b019725df5 100644
--- a/slice2java/js/test/Ice/operations/Test/MyStruct.java
+++ b/slice2java/js/test/Ice/operations/Test/MyStruct.java
@@ -148,5 +148,5 @@ static public java.util.Optional<MyStruct> ice_read(com.zeroc.Ice.InputStream is
     private static final MyStruct _nullMarshalValue = new MyStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 495493227861838877L;
+    private static final long serialVersionUID = 5570493382746656669L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/Ice/operations/Test/MyStruct1.java
index b8edc3e6125e..7c8756f558cb 100644
--- a/slice2java/js/test/Ice/operations/Test/MyStruct1.java
+++ b/slice2java/js/test/Ice/operations/Test/MyStruct1.java
@@ -170,5 +170,5 @@ static public java.util.Optional<MyStruct1> ice_read(com.zeroc.Ice.InputStream i
     private static final MyStruct1 _nullMarshalValue = new MyStruct1();
 
     /** @hidden */
-    private static final long serialVersionUID = 191885579442598465L;
+    private static final long serialVersionUID = 6710641526528094102L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/Structure.java b/slice2java/js/test/Ice/operations/Test/Structure.java
index d88f194fa0e0..fd5fcb9186e7 100644
--- a/slice2java/js/test/Ice/operations/Test/Structure.java
+++ b/slice2java/js/test/Ice/operations/Test/Structure.java
@@ -170,5 +170,5 @@ static public java.util.Optional<Structure> ice_read(com.zeroc.Ice.InputStream i
     private static final Structure _nullMarshalValue = new Structure();
 
     /** @hidden */
-    private static final long serialVersionUID = -3982100640660299559L;
+    private static final long serialVersionUID = -1068251096666537071L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/A.java b/slice2java/js/test/Ice/optional/Test/A.java
index 1b8b0b8f71e4..535130c5085e 100644
--- a/slice2java/js/test/Ice/optional/Test/A.java
+++ b/slice2java/js/test/Ice/optional/Test/A.java
@@ -212,7 +212,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8899403727508641808L;
+    private static final long serialVersionUID = 4034220981611106832L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/B.java b/slice2java/js/test/Ice/optional/Test/B.java
index b32f12d635a8..5bea9ec23a23 100644
--- a/slice2java/js/test/Ice/optional/Test/B.java
+++ b/slice2java/js/test/Ice/optional/Test/B.java
@@ -107,7 +107,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7115782686578850077L;
+    private static final long serialVersionUID = -6605064531061546397L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/C.java b/slice2java/js/test/Ice/optional/Test/C.java
index b722fef4ceeb..0cc8026afbc3 100644
--- a/slice2java/js/test/Ice/optional/Test/C.java
+++ b/slice2java/js/test/Ice/optional/Test/C.java
@@ -110,7 +110,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1943589993511864957L;
+    private static final long serialVersionUID = 2514055879072396285L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/DerivedException.java b/slice2java/js/test/Ice/optional/Test/DerivedException.java
index 83058f3cfbfe..642bd0af71ca 100644
--- a/slice2java/js/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/js/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7746196153805300372L;
+    private static final long serialVersionUID = -446193901231099322L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/E.java b/slice2java/js/test/Ice/optional/Test/E.java
index 6366350a60c2..9e33f1d0781f 100644
--- a/slice2java/js/test/Ice/optional/Test/E.java
+++ b/slice2java/js/test/Ice/optional/Test/E.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1850732655410566297L;
+    private static final long serialVersionUID = -1850739532559156683L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/F.java b/slice2java/js/test/Ice/optional/Test/F.java
index 48540d3f346b..5ddfb4d765fd 100644
--- a/slice2java/js/test/Ice/optional/Test/F.java
+++ b/slice2java/js/test/Ice/optional/Test/F.java
@@ -105,7 +105,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6430494179614523244L;
+    private static final long serialVersionUID = -6430492757626633914L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/Ice/optional/Test/FixedStruct.java
index 42632bcd73aa..94b8d25ad379 100644
--- a/slice2java/js/test/Ice/optional/Test/FixedStruct.java
+++ b/slice2java/js/test/Ice/optional/Test/FixedStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<FixedStruct> ice_read(com.zeroc.Ice.InputStream
     private static final FixedStruct _nullMarshalValue = new FixedStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 1569613753926470652L;
+    private static final long serialVersionUID = 1569601295212024622L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/G.java b/slice2java/js/test/Ice/optional/Test/G.java
index e34f487c63a7..b42d10ed3623 100644
--- a/slice2java/js/test/Ice/optional/Test/G.java
+++ b/slice2java/js/test/Ice/optional/Test/G.java
@@ -168,7 +168,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2754359461987793811L;
+    private static final long serialVersionUID = -7659235413247775981L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/G1.java b/slice2java/js/test/Ice/optional/Test/G1.java
index 00da9118d8e9..84cc77ad5be2 100644
--- a/slice2java/js/test/Ice/optional/Test/G1.java
+++ b/slice2java/js/test/Ice/optional/Test/G1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<G1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G1 _nullMarshalValue = new G1();
 
     /** @hidden */
-    private static final long serialVersionUID = 7339783144178593946L;
+    private static final long serialVersionUID = 7339784692577320136L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/G2.java b/slice2java/js/test/Ice/optional/Test/G2.java
index 4d002c3a74ad..9aabfcb7973f 100644
--- a/slice2java/js/test/Ice/optional/Test/G2.java
+++ b/slice2java/js/test/Ice/optional/Test/G2.java
@@ -138,5 +138,5 @@ static public java.util.Optional<G2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G2 _nullMarshalValue = new G2();
 
     /** @hidden */
-    private static final long serialVersionUID = 3824557957926395268L;
+    private static final long serialVersionUID = 3824551080783385174L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/Ice/optional/Test/MultiOptional.java
index 81d6107d5441..1d2032651e94 100644
--- a/slice2java/js/test/Ice/optional/Test/MultiOptional.java
+++ b/slice2java/js/test/Ice/optional/Test/MultiOptional.java
@@ -1675,7 +1675,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4943792820690353414L;
+    private static final long serialVersionUID = 7096119252842925844L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/OneOptional.java b/slice2java/js/test/Ice/optional/Test/OneOptional.java
index 2ceadbc45ebf..dea15f460d72 100644
--- a/slice2java/js/test/Ice/optional/Test/OneOptional.java
+++ b/slice2java/js/test/Ice/optional/Test/OneOptional.java
@@ -96,7 +96,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7219608659393085678L;
+    private static final long serialVersionUID = -7219599137322699072L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/OptionalException.java b/slice2java/js/test/Ice/optional/Test/OptionalException.java
index e3c88f1201bb..3e54adb5579c 100644
--- a/slice2java/js/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/js/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6611376270879833139L;
+    private static final long serialVersionUID = 3869949302855535199L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java
index 529f206b222d..b28ed9d3e967 100644
--- a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java
+++ b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java
@@ -186,7 +186,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2329680388022283643L;
+    private static final long serialVersionUID = -8381530328486699525L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/RequiredException.java b/slice2java/js/test/Ice/optional/Test/RequiredException.java
index 5b2f4dd12a36..4056ada5c1cf 100644
--- a/slice2java/js/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/js/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894245518111787347L;
+    private static final long serialVersionUID = 2894238635807611649L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/Ice/optional/Test/SmallStruct.java
index f16f57908dd0..e77da0c1c4c6 100644
--- a/slice2java/js/test/Ice/optional/Test/SmallStruct.java
+++ b/slice2java/js/test/Ice/optional/Test/SmallStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<SmallStruct> ice_read(com.zeroc.Ice.InputStream
     private static final SmallStruct _nullMarshalValue = new SmallStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 6700991849126265642L;
+    private static final long serialVersionUID = 6700987821109034872L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/VarStruct.java b/slice2java/js/test/Ice/optional/Test/VarStruct.java
index e66b3e42a33b..f044181be0ea 100644
--- a/slice2java/js/test/Ice/optional/Test/VarStruct.java
+++ b/slice2java/js/test/Ice/optional/Test/VarStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<VarStruct> ice_read(com.zeroc.Ice.InputStream i
     private static final VarStruct _nullMarshalValue = new VarStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -1912285723405567470L;
+    private static final long serialVersionUID = -1912284175006841280L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/WD.java b/slice2java/js/test/Ice/optional/Test/WD.java
index 242d8a724f80..cbdc34e1577d 100644
--- a/slice2java/js/test/Ice/optional/Test/WD.java
+++ b/slice2java/js/test/Ice/optional/Test/WD.java
@@ -152,7 +152,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1516057258020958216L;
+    private static final long serialVersionUID = -8310158206654832184L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C.java b/slice2java/js/test/Ice/scope/Test/C.java
index c51a01e81c9b..bedaf6d78e3a 100644
--- a/slice2java/js/test/Ice/scope/Test/C.java
+++ b/slice2java/js/test/Ice/scope/Test/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5190251422020357530L;
+    private static final long serialVersionUID = -5190247246626360197L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C1.java b/slice2java/js/test/Ice/scope/Test/C1.java
index 2c54af6ccadf..702afafcfc84 100644
--- a/slice2java/js/test/Ice/scope/Test/C1.java
+++ b/slice2java/js/test/Ice/scope/Test/C1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8893231869110963943L;
+    private static final long serialVersionUID = 8893233154205287802L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C2.java b/slice2java/js/test/Ice/scope/Test/C2.java
index 0fbba4bf4ff3..551b0c128cf9 100644
--- a/slice2java/js/test/Ice/scope/Test/C2.java
+++ b/slice2java/js/test/Ice/scope/Test/C2.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -936985141939105690L;
+    private static final long serialVersionUID = 1735749230219148182L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/Inner/C.java b/slice2java/js/test/Ice/scope/Test/Inner/C.java
index ef8ff806d02c..622189f90f12 100644
--- a/slice2java/js/test/Ice/scope/Test/Inner/C.java
+++ b/slice2java/js/test/Ice/scope/Test/Inner/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4615629634385086078L;
+    private static final long serialVersionUID = 4615622894166999450L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java
index f856cddb43ed..a4233df5e294 100644
--- a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java
+++ b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 672584898061819514L;
+    private static final long serialVersionUID = 672588737690296774L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java
index fe77d97a798f..805fc9ff090b 100644
--- a/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java
+++ b/slice2java/js/test/Ice/scope/Test/Inner/Inner2/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 8654440765444497026L;
+    private static final long serialVersionUID = 8654439480507534375L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/Inner/S.java b/slice2java/js/test/Ice/scope/Test/Inner/S.java
index baaa7c521f27..5717309da195 100644
--- a/slice2java/js/test/Ice/scope/Test/Inner/S.java
+++ b/slice2java/js/test/Ice/scope/Test/Inner/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 3694611836812778958L;
+    private static final long serialVersionUID = 3694621462206148203L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S.java b/slice2java/js/test/Ice/scope/Test/S.java
index a2cbdc72cd27..84dcf28f7063 100644
--- a/slice2java/js/test/Ice/scope/Test/S.java
+++ b/slice2java/js/test/Ice/scope/Test/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 2159709530404348720L;
+    private static final long serialVersionUID = 2159697340160053717L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S1.java b/slice2java/js/test/Ice/scope/Test/S1.java
index 3ee57984fa53..2672eeea04b3 100644
--- a/slice2java/js/test/Ice/scope/Test/S1.java
+++ b/slice2java/js/test/Ice/scope/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = 1241676401513429086L;
+    private static final long serialVersionUID = 1241674790964716611L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S2.java b/slice2java/js/test/Ice/scope/Test/S2.java
index 9a374d543c8b..4fa4c3314295 100644
--- a/slice2java/js/test/Ice/scope/Test/S2.java
+++ b/slice2java/js/test/Ice/scope/Test/S2.java
@@ -170,5 +170,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = -4564145492492890209L;
+    private static final long serialVersionUID = -7483362902288787217L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java
index 24301cd71a66..aea9a52831fb 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477021394797054982L;
+    private static final long serialVersionUID = -477023941586390653L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java
index f8866422fb32..74f5ff2c60df 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485211380792174108L;
+    private static final long serialVersionUID = 3485214609457083301L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 978c2b12d46a..cdd31e3dce6c 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717374825682939373L;
+    private static final long serialVersionUID = 1717378054348092628L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 121663ef03ca..c092394473fe 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384920922660755724L;
+    private static final long serialVersionUID = -7384918375871106803L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java
index bfcc61aeb498..06de17bbc69a 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2733698549178084751L;
+    private static final long serialVersionUID = -2733707233003727800L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
index afd0587a0b09..336fb1c11d26 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4528103940780529656L;
+    private static final long serialVersionUID = 4528095938830492929L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/B.java b/slice2java/js/test/Ice/slicing/objects/Test/B.java
index 7839c7de6954..485556603298 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/B.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/B.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1727734325274113892L;
+    private static final long serialVersionUID = 4911182833146502633L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java
index 469f754d5ea8..603ee8ff420c 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8363692436907361584L;
+    private static final long serialVersionUID = -7860788354468204891L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 763b3dcb4399..e0a9072df97a 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6396993958632298061L;
+    private static final long serialVersionUID = -6397005929278366700L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java
index 17b7832997ea..77f5d4b07e0c 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/CompactPDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9066889282273926978L;
+    private static final long serialVersionUID = -9066880039361425779L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/D1.java b/slice2java/js/test/Ice/slicing/objects/Test/D1.java
index e0fa56f9d8a3..049f5f6530e0 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/D1.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/D1.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9218514348117408703L;
+    private static final long serialVersionUID = 5825977122587238762L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/D3.java b/slice2java/js/test/Ice/slicing/objects/Test/D3.java
index 32ad74eb064b..37e137d08ba1 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/D3.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/D3.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6993093912334177027L;
+    private static final long serialVersionUID = 8061107645835866152L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java
index 183de9220afd..ca0b3cdbfc7e 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6209365445846795123L;
+    private static final long serialVersionUID = 4242119203339511786L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java
index f3ffe29a61ce..8d07e5683f7f 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7655931168033917189L;
+    private static final long serialVersionUID = -7655919070955808919L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java
index ac4cb90c0b24..2cbd080e9a96 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/Hidden.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2271120692113263559L;
+    private static final long serialVersionUID = -2271132788940360662L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PBase.java b/slice2java/js/test/Ice/slicing/objects/Test/PBase.java
index 2b036b1edc07..dc7370ebe936 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/PBase.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/PBase.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 481716935808783689L;
+    private static final long serialVersionUID = 481704965222469626L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java
index 0dd46c0124d3..582d2cae2d9a 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4426878820454449165L;
+    private static final long serialVersionUID = -4426890956104961452L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java
index 6bd6033a1ae0..e72009fa31d7 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 850535820596101012L;
+    private static final long serialVersionUID = 850542666789177063L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java
index b653bff2f33f..74bb805ea647 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/PCDerived3.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4328906848845815628L;
+    private static final long serialVersionUID = -4328900212090261818L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java
index 81f615a40da8..21e9a20f8f52 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/PCUnknown.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5081810432905381432L;
+    private static final long serialVersionUID = -5081814342109308683L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java
index cd3f93cfcab9..5916a92f49c9 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/PDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 643087792329302905L;
+    private static final long serialVersionUID = 643078257619968010L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/PNode.java b/slice2java/js/test/Ice/slicing/objects/Test/PNode.java
index 43e15c634543..41634f3d1dd1 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/PNode.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/PNode.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2438005259572444808L;
+    private static final long serialVersionUID = -2438003587369270074L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java
index 0c7f6741ddb7..ac546c2b2c28 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/Preserved.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3651536741278846337L;
+    private static final long serialVersionUID = 3651524644347973756L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java
index da784aa68315..c10a46487a20 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/SBSKnownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8804373996239190308L;
+    private static final long serialVersionUID = 8804375051456695897L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SBase.java b/slice2java/js/test/Ice/slicing/objects/Test/SBase.java
index e47dd349b39b..53316ffe5809 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/SBase.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/SBase.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5353758614848660654L;
+    private static final long serialVersionUID = -5353757107774744081L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SS1.java b/slice2java/js/test/Ice/slicing/objects/Test/SS1.java
index dab9c65207ff..ec2b0ff94e3c 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/SS1.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/SS1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6522143201298609200L;
+    private static final long serialVersionUID = -6522133792977868459L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SS2.java b/slice2java/js/test/Ice/slicing/objects/Test/SS2.java
index 1229e2f211ec..22ff026158f8 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/SS2.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/SS2.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7620284803271415251L;
+    private static final long serialVersionUID = 7620286023692282582L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/SS3.java b/slice2java/js/test/Ice/slicing/objects/Test/SS3.java
index c2222bb83710..55cbba791e33 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/SS3.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/SS3.java
@@ -155,5 +155,5 @@ static public java.util.Optional<SS3> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final SS3 _nullMarshalValue = new SS3();
 
     /** @hidden */
-    private static final long serialVersionUID = -6112625820188197228L;
+    private static final long serialVersionUID = -5393947529914840302L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/LargeStruct.java b/slice2java/js/test/Ice/stream/Test/LargeStruct.java
index 11066b1669fa..9b5d335ba174 100644
--- a/slice2java/js/test/Ice/stream/Test/LargeStruct.java
+++ b/slice2java/js/test/Ice/stream/Test/LargeStruct.java
@@ -240,5 +240,5 @@ static public java.util.Optional<LargeStruct> ice_read(com.zeroc.Ice.InputStream
     private static final LargeStruct _nullMarshalValue = new LargeStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 5384131471292999534L;
+    private static final long serialVersionUID = 3561541149412928814L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/MyClass.java b/slice2java/js/test/Ice/stream/Test/MyClass.java
index 2f0e646dfc41..ed582b0362b7 100644
--- a/slice2java/js/test/Ice/stream/Test/MyClass.java
+++ b/slice2java/js/test/Ice/stream/Test/MyClass.java
@@ -85,7 +85,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7734886210708894468L;
+    private static final long serialVersionUID = 3901457561632410492L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/stream/Test/MyException.java b/slice2java/js/test/Ice/stream/Test/MyException.java
index 90b2eb8bebf6..7ee4570a2fa7 100644
--- a/slice2java/js/test/Ice/stream/Test/MyException.java
+++ b/slice2java/js/test/Ice/stream/Test/MyException.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734227488393199816L;
+    private static final long serialVersionUID = 5734226544403354093L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/Ice/stream/Test/OptionalClass.java
index 2a00bfe6dda7..e59ccd5ebb3c 100644
--- a/slice2java/js/test/Ice/stream/Test/OptionalClass.java
+++ b/slice2java/js/test/Ice/stream/Test/OptionalClass.java
@@ -162,7 +162,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7783778378916942468L;
+    private static final long serialVersionUID = -4379268440987441124L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/Clash/Cls.java b/slice2java/js/test/Slice/escape/Clash/Cls.java
index e7cf152d3e22..62c58b4a87e7 100644
--- a/slice2java/js/test/Slice/escape/Clash/Cls.java
+++ b/slice2java/js/test/Slice/escape/Clash/Cls.java
@@ -172,7 +172,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8403389197914450787L;
+    private static final long serialVersionUID = -6493785939726319720L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/Clash/Ex.java b/slice2java/js/test/Slice/escape/Clash/Ex.java
index c5840a581883..3e48b92b58c9 100644
--- a/slice2java/js/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/js/test/Slice/escape/Clash/Ex.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3630196396563608971L;
+    private static final long serialVersionUID = 6932258969351510435L;
 }
diff --git a/slice2java/js/test/Slice/escape/Clash/St.java b/slice2java/js/test/Slice/escape/Clash/St.java
index c3d6342840b6..7f1eaea17c22 100644
--- a/slice2java/js/test/Slice/escape/Clash/St.java
+++ b/slice2java/js/test/Slice/escape/Clash/St.java
@@ -197,5 +197,5 @@ static public java.util.Optional<St> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final St _nullMarshalValue = new St();
 
     /** @hidden */
-    private static final long serialVersionUID = 3656850062513406899L;
+    private static final long serialVersionUID = 3281448080470395385L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/BaseMethods.java b/slice2java/js/test/Slice/escape/await/BaseMethods.java
index f8fcc8b55313..15af5aa7b9e1 100644
--- a/slice2java/js/test/Slice/escape/await/BaseMethods.java
+++ b/slice2java/js/test/Slice/escape/await/BaseMethods.java
@@ -122,5 +122,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8621178233227497715L;
+    private static final long serialVersionUID = 8181522393316565456L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/_break.java b/slice2java/js/test/Slice/escape/await/_break.java
index eebb9b435725..de9d51c8672b 100644
--- a/slice2java/js/test/Slice/escape/await/_break.java
+++ b/slice2java/js/test/Slice/escape/await/_break.java
@@ -195,5 +195,5 @@ static public java.util.Optional<_break> ice_read(com.zeroc.Ice.InputStream istr
     private static final _break _nullMarshalValue = new _break();
 
     /** @hidden */
-    private static final long serialVersionUID = -6304145026936292858L;
+    private static final long serialVersionUID = 7405789297927376133L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/_package.java b/slice2java/js/test/Slice/escape/await/_package.java
index 8f5070e27464..a810cd8f4e48 100644
--- a/slice2java/js/test/Slice/escape/await/_package.java
+++ b/slice2java/js/test/Slice/escape/await/_package.java
@@ -369,7 +369,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4164657580850149401L;
+    private static final long serialVersionUID = 5837630975285732185L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/await/delete.java b/slice2java/js/test/Slice/escape/await/delete.java
index 999a1fb78587..8c63e58a939f 100644
--- a/slice2java/js/test/Slice/escape/await/delete.java
+++ b/slice2java/js/test/Slice/escape/await/delete.java
@@ -67,7 +67,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2528753032659795895L;
+    private static final long serialVersionUID = 2860752118349545396L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/await/fixed.java b/slice2java/js/test/Slice/escape/await/fixed.java
index 434c3e9278f5..2de8be52355d 100644
--- a/slice2java/js/test/Slice/escape/await/fixed.java
+++ b/slice2java/js/test/Slice/escape/await/fixed.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3808656080288813576L;
+    private static final long serialVersionUID = 3808655877449862571L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/foreach.java b/slice2java/js/test/Slice/escape/await/foreach.java
index d27d5eb09304..b3956dd265fe 100644
--- a/slice2java/js/test/Slice/escape/await/foreach.java
+++ b/slice2java/js/test/Slice/escape/await/foreach.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6310374486095789129L;
+    private static final long serialVersionUID = 5398404599188973577L;
 }
diff --git a/slice2java/js/test/Slice/macros/Test/Default.java b/slice2java/js/test/Slice/macros/Test/Default.java
index 79f5325e8595..f6a29cdfcdaf 100644
--- a/slice2java/js/test/Slice/macros/Test/Default.java
+++ b/slice2java/js/test/Slice/macros/Test/Default.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4485270748039600514L;
+    private static final long serialVersionUID = -3828747926626903522L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/macros/Test/NoDefault.java b/slice2java/js/test/Slice/macros/Test/NoDefault.java
index 6f38905a80db..71ece14fefc4 100644
--- a/slice2java/js/test/Slice/macros/Test/NoDefault.java
+++ b/slice2java/js/test/Slice/macros/Test/NoDefault.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5374706222650630175L;
+    private static final long serialVersionUID = 8008049250685051263L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java
index 0695ed65f151..84f625c11fcc 100644
--- a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java
+++ b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java
@@ -106,7 +106,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3888495807192903112L;
+    private static final long serialVersionUID = 2155752511795003704L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 3dbc1f57f100..72e8591778ab 100644
--- a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java
+++ b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3349856282683343904L;
+    private static final long serialVersionUID = 4989497286327004192L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 0dbf0fbeaeca..79e94d4a7de4 100644
--- a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
+++ b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8593713801919968297L;
+    private static final long serialVersionUID = 6339930407598590155L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java
index 92ed8b537a85..042fd0ae6f63 100644
--- a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java
+++ b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java
@@ -68,7 +68,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4030813814884063169L;
+    private static final long serialVersionUID = -1599060355250475009L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java
index 6e73320f3720..bf2010501a3c 100644
--- a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java
+++ b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<InnerStruct> ice_read(com.zeroc.Ice.InputStream
     private static final InnerStruct _nullMarshalValue = new InnerStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 5127393512769384689L;
+    private static final long serialVersionUID = 5127390165128150547L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java
index 8033ed6c305e..fb4967c343e7 100644
--- a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java
+++ b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct1> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct1 _nullMarshalValue = new Struct1();
 
     /** @hidden */
-    private static final long serialVersionUID = -7467227034668004761L;
+    private static final long serialVersionUID = 7491367309906272231L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java
index 94cd0ff5df8a..c052164cc222 100644
--- a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java
+++ b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java
@@ -370,5 +370,5 @@ static public java.util.Optional<Struct2> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct2 _nullMarshalValue = new Struct2();
 
     /** @hidden */
-    private static final long serialVersionUID = 8309215603991631410L;
+    private static final long serialVersionUID = 5897560088783047858L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java
index 42150cc111af..8de9a17db6d5 100644
--- a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java
+++ b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java
@@ -274,5 +274,5 @@ static public java.util.Optional<StructNoDefaults> ice_read(com.zeroc.Ice.InputS
     private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults();
 
     /** @hidden */
-    private static final long serialVersionUID = -3220296716747685529L;
+    private static final long serialVersionUID = 6314518154640566405L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/A.java b/slice2java/matlab/test/Ice/exceptions/Test/A.java
index 2206e3eb3279..e107debbc316 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/A.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823744787489988325L;
+    private static final long serialVersionUID = 7823746666562450405L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/B.java b/slice2java/matlab/test/Ice/exceptions/Test/B.java
index cd02d8b943ee..9adeb2dd458c 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/B.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861405656012984795L;
+    private static final long serialVersionUID = -3861409231944965339L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/C.java b/slice2java/matlab/test/Ice/exceptions/Test/C.java
index fc1d9fdb5f2d..b5723ebe63ab 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/C.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080698478692773605L;
+    private static final long serialVersionUID = 1080700357765235685L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/D.java b/slice2java/matlab/test/Ice/exceptions/Test/D.java
index 36d384773f42..49d775e367fc 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/D.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780386612089093413L;
+    private static final long serialVersionUID = 4780383036157112869L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/E.java b/slice2java/matlab/test/Ice/exceptions/Test/E.java
index 8cf803aa9f4e..6fcccc0cfc33 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/E.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/E.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1876975328793055640L;
+    private static final long serialVersionUID = -1876971995500352384L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/F.java b/slice2java/matlab/test/Ice/exceptions/Test/F.java
index 09ea56add96e..f902971a8a24 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/F.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/F.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 733476251018838059L;
+    private static final long serialVersionUID = 733479821958239875L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java
index a4f5b73bd647..3edc75a8ed67 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641415681761513359L;
+    private static final long serialVersionUID = -4641412519096425359L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java
index 3909caaf0533..7707a1130d01 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8471298146767223875L;
+    private static final long serialVersionUID = -8471299798476692294L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java
index 615066a3fb3f..85896370097c 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8898654149108646677L;
+    private static final long serialVersionUID = 8898660760216268434L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java
index c0107c5cb71d..43d9bbc0a371 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4040523581901517050L;
+    private static final long serialVersionUID = 4040519607976377469L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java
index 8188cc021131..18a1e0094dab 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5383253406593241277L;
+    private static final long serialVersionUID = 5383241164846714554L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java
index 840fa623f2a5..32d269d41fc5 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4057360551952956613L;
+    private static final long serialVersionUID = 4057353940845772482L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java
index 11359d284f9a..fdd25f0c2ef6 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1044057913753576894L;
+    private static final long serialVersionUID = -1044056262044182523L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java
index a6f9b2130268..d599665a8024 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1862553337095532624L;
+    private static final long serialVersionUID = -1862559948203075977L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java
index bdf50afe49e7..c04d58cd170f 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2187168222233417206L;
+    private static final long serialVersionUID = -2187166570528901299L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java
index 7c35d3134220..b5509e0e0ad8 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java
@@ -52,7 +52,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5862586863859320925L;
+    private static final long serialVersionUID = 5506360364678103428L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java
index 5b87cea12d1b..e4f6b2812c6b 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java
@@ -142,5 +142,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = -5145823107740154355L;
+    private static final long serialVersionUID = -5145819133815080118L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java
index bb8e65ef9fb7..cc0bef41b053 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = 3347998910210395309L;
+    private static final long serialVersionUID = 3347994615996741162L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java
index dc079f40fbc3..ef0fd9acc385 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java
@@ -139,5 +139,5 @@ static public java.util.Optional<S3> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S3 _nullMarshalValue = new S3();
 
     /** @hidden */
-    private static final long serialVersionUID = -9162148303689944608L;
+    private static final long serialVersionUID = -9162157562302013337L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java
index 62bb1dc5d6bd..4b8d9d2cf701 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java
@@ -139,5 +139,5 @@ static public java.util.Optional<S4> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S4 _nullMarshalValue = new S4();
 
     /** @hidden */
-    private static final long serialVersionUID = -2752857468445976895L;
+    private static final long serialVersionUID = -2752859115150440634L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java
index c7065d981d76..c5859f63dd5c 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java
@@ -142,5 +142,5 @@ static public java.util.Optional<S5> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S5 _nullMarshalValue = new S5();
 
     /** @hidden */
-    private static final long serialVersionUID = -6601214005063501601L;
+    private static final long serialVersionUID = -6601226241805158696L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java
index acfcdc32cb9c..515fc94e6de8 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java
@@ -142,5 +142,5 @@ static public java.util.Optional<S6> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S6 _nullMarshalValue = new S6();
 
     /** @hidden */
-    private static final long serialVersionUID = 3216396181114490618L;
+    private static final long serialVersionUID = 3216397827819158845L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java
index c835e542aaa0..26dbc91bc6d9 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java
@@ -139,5 +139,5 @@ static public java.util.Optional<S7> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S7 _nullMarshalValue = new S7();
 
     /** @hidden */
-    private static final long serialVersionUID = -3218146534061889430L;
+    private static final long serialVersionUID = -3218158770803627219L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java
index c7afd0eb475d..72aee6ae17f6 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java
@@ -139,5 +139,5 @@ static public java.util.Optional<S8> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S8 _nullMarshalValue = new S8();
 
     /** @hidden */
-    private static final long serialVersionUID = 4560071094182584190L;
+    private static final long serialVersionUID = 4560083330924319417L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java
index e06c55e69d6c..5828baa1477c 100644
--- a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java
+++ b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java
@@ -148,5 +148,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = 5757937893093940883L;
+    private static final long serialVersionUID = -2111846779050201357L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/A.java b/slice2java/matlab/test/Ice/objects/Test/A.java
index 9e534aaa764e..c251ab6fb02e 100644
--- a/slice2java/matlab/test/Ice/objects/Test/A.java
+++ b/slice2java/matlab/test/Ice/objects/Test/A.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8578143475226821157L;
+    private static final long serialVersionUID = 3101641177055905747L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/A1.java b/slice2java/matlab/test/Ice/objects/Test/A1.java
index d9548da68e3a..4c9c3e6c6fbc 100644
--- a/slice2java/matlab/test/Ice/objects/Test/A1.java
+++ b/slice2java/matlab/test/Ice/objects/Test/A1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5926752076740300875L;
+    private static final long serialVersionUID = -5926746641022698961L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/B.java b/slice2java/matlab/test/Ice/objects/Test/B.java
index 777cfe41e95e..97ecaa7e8de9 100644
--- a/slice2java/matlab/test/Ice/objects/Test/B.java
+++ b/slice2java/matlab/test/Ice/objects/Test/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8890917835281599589L;
+    private static final long serialVersionUID = -8890912360774674713L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/B1.java b/slice2java/matlab/test/Ice/objects/Test/B1.java
index b02d9ca9151f..fe21e6f4320b 100644
--- a/slice2java/matlab/test/Ice/objects/Test/B1.java
+++ b/slice2java/matlab/test/Ice/objects/Test/B1.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 367423452263144068L;
+    private static final long serialVersionUID = 4146217166183311620L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Base.java b/slice2java/matlab/test/Ice/objects/Test/Base.java
index b876637a8864..e87d0925011f 100644
--- a/slice2java/matlab/test/Ice/objects/Test/Base.java
+++ b/slice2java/matlab/test/Ice/objects/Test/Base.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2617616295592842744L;
+    private static final long serialVersionUID = 1362601087714512124L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/C.java b/slice2java/matlab/test/Ice/objects/Test/C.java
index 0cd4a46dcbe9..1915b446ac4f 100644
--- a/slice2java/matlab/test/Ice/objects/Test/C.java
+++ b/slice2java/matlab/test/Ice/objects/Test/C.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7888720478479826140L;
+    private static final long serialVersionUID = -2827214445887489L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/COneMember.java b/slice2java/matlab/test/Ice/objects/Test/COneMember.java
index c411390daf57..e49ac8061f71 100644
--- a/slice2java/matlab/test/Ice/objects/Test/COneMember.java
+++ b/slice2java/matlab/test/Ice/objects/Test/COneMember.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3050971065749473568L;
+    private static final long serialVersionUID = 3050965756444117168L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java
index 8d9b8a9d3840..6313e811a627 100644
--- a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java
+++ b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9151397080183811483L;
+    private static final long serialVersionUID = -6820726246324239589L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/D.java b/slice2java/matlab/test/Ice/objects/Test/D.java
index a8f219e4a6e4..134c840b6e89 100644
--- a/slice2java/matlab/test/Ice/objects/Test/D.java
+++ b/slice2java/matlab/test/Ice/objects/Test/D.java
@@ -57,7 +57,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1744926457162362108L;
+    private static final long serialVersionUID = -6916153255367633936L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/D1.java b/slice2java/matlab/test/Ice/objects/Test/D1.java
index e25b70deb32a..a9348a024565 100644
--- a/slice2java/matlab/test/Ice/objects/Test/D1.java
+++ b/slice2java/matlab/test/Ice/objects/Test/D1.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5449696892909225539L;
+    private static final long serialVersionUID = 2074672915269816899L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/E.java b/slice2java/matlab/test/Ice/objects/Test/E.java
index cc0c3a2a69c4..011290f56e27 100644
--- a/slice2java/matlab/test/Ice/objects/Test/E.java
+++ b/slice2java/matlab/test/Ice/objects/Test/E.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9061755693091500574L;
+    private static final long serialVersionUID = 4152679674059859620L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/EBase.java b/slice2java/matlab/test/Ice/objects/Test/EBase.java
index e6431109e726..6ce6a6c5d15e 100644
--- a/slice2java/matlab/test/Ice/objects/Test/EBase.java
+++ b/slice2java/matlab/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1703528228596622158L;
+    private static final long serialVersionUID = -8633872879347601970L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/EDerived.java b/slice2java/matlab/test/Ice/objects/Test/EDerived.java
index a76edf8af345..76a9d9f5d936 100644
--- a/slice2java/matlab/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/matlab/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2740950385718730194L;
+    private static final long serialVersionUID = 4643002156872209106L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java
index 91f18e394862..dcbedf6b08b3 100644
--- a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225292821401711505L;
+    private static final long serialVersionUID = -6225287385684365953L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java
index f7229eac7516..02d2b7371403 100644
--- a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4572652890746350612L;
+    private static final long serialVersionUID = 7538015705833178772L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/F.java b/slice2java/matlab/test/Ice/objects/Test/F.java
index adeede6ca3c5..a15d123a44f2 100644
--- a/slice2java/matlab/test/Ice/objects/Test/F.java
+++ b/slice2java/matlab/test/Ice/objects/Test/F.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8419214185255843887L;
+    private static final long serialVersionUID = -6218367273740743791L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/F1.java b/slice2java/matlab/test/Ice/objects/Test/F1.java
index e421fa2d1f95..fd1c856ff103 100644
--- a/slice2java/matlab/test/Ice/objects/Test/F1.java
+++ b/slice2java/matlab/test/Ice/objects/Test/F1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6192369259130126311L;
+    private static final long serialVersionUID = 6192376536644624168L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/F3.java b/slice2java/matlab/test/Ice/objects/Test/F3.java
index 0910e356b3cf..5f27b6aa50fe 100644
--- a/slice2java/matlab/test/Ice/objects/Test/F3.java
+++ b/slice2java/matlab/test/Ice/objects/Test/F3.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6290699292669151939L;
+    private static final long serialVersionUID = 5109950032688499143L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Inner/A.java b/slice2java/matlab/test/Ice/objects/Test/Inner/A.java
index a72bb6e68c26..8552dadbffac 100644
--- a/slice2java/matlab/test/Ice/objects/Test/Inner/A.java
+++ b/slice2java/matlab/test/Ice/objects/Test/Inner/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1425265747019648719L;
+    private static final long serialVersionUID = -1425260272355617011L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java b/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java
index 2a20347eab75..2ca8489ddd14 100644
--- a/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337233992423275636L;
+    private static final long serialVersionUID = -2337228517828670954L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java
index b5ab0df876be..221dcbf97c29 100644
--- a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java
+++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1298684306411852310L;
+    private static final long serialVersionUID = -1298689742180525308L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java
index a459aeeb73a7..4ab45d7e2d23 100644
--- a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842233477322911016L;
+    private static final long serialVersionUID = 1842228206913213490L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/K.java b/slice2java/matlab/test/Ice/objects/Test/K.java
index ec055a5c8e98..305bd42ca333 100644
--- a/slice2java/matlab/test/Ice/objects/Test/K.java
+++ b/slice2java/matlab/test/Ice/objects/Test/K.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4645167867501505986L;
+    private static final long serialVersionUID = 4645162266482440480L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/L.java b/slice2java/matlab/test/Ice/objects/Test/L.java
index 78a1769ce580..de0f35bc1de9 100644
--- a/slice2java/matlab/test/Ice/objects/Test/L.java
+++ b/slice2java/matlab/test/Ice/objects/Test/L.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6629744241073061438L;
+    private static final long serialVersionUID = 6629749676771685284L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/M.java b/slice2java/matlab/test/Ice/objects/Test/M.java
index d8467eae6d83..881ccb83811c 100644
--- a/slice2java/matlab/test/Ice/objects/Test/M.java
+++ b/slice2java/matlab/test/Ice/objects/Test/M.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8088098066085773863L;
+    private static final long serialVersionUID = -8088103375391163063L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Recursive.java b/slice2java/matlab/test/Ice/objects/Test/Recursive.java
index 16b44f5f7409..7df55274d45c 100644
--- a/slice2java/matlab/test/Ice/objects/Test/Recursive.java
+++ b/slice2java/matlab/test/Ice/objects/Test/Recursive.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3617883952596001767L;
+    private static final long serialVersionUID = 3617889261901677951L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/S.java b/slice2java/matlab/test/Ice/objects/Test/S.java
index 830b8dac03f2..51a83ba41ab7 100644
--- a/slice2java/matlab/test/Ice/objects/Test/S.java
+++ b/slice2java/matlab/test/Ice/objects/Test/S.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 481772516607890317L;
+    private static final long serialVersionUID = 481778156510395031L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java
index ff065db3cb51..34c63341535c 100644
--- a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java
+++ b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java
@@ -142,5 +142,5 @@ static public java.util.Optional<SOneMember> ice_read(com.zeroc.Ice.InputStream
     private static final SOneMember _nullMarshalValue = new SOneMember();
 
     /** @hidden */
-    private static final long serialVersionUID = 6227753842903689977L;
+    private static final long serialVersionUID = 6227748572494244457L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java
index 1bd46eecc02c..58a20bfaed5d 100644
--- a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java
+++ b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java
@@ -155,5 +155,5 @@ static public java.util.Optional<STwoMembers> ice_read(com.zeroc.Ice.InputStream
     private static final STwoMembers _nullMarshalValue = new STwoMembers();
 
     /** @hidden */
-    private static final long serialVersionUID = -4531329201328764542L;
+    private static final long serialVersionUID = 8057217438044630786L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/StructKey.java b/slice2java/matlab/test/Ice/objects/Test/StructKey.java
index 05796a6b73e4..695a0762157f 100644
--- a/slice2java/matlab/test/Ice/objects/Test/StructKey.java
+++ b/slice2java/matlab/test/Ice/objects/Test/StructKey.java
@@ -153,5 +153,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = -2755292533631123246L;
+    private static final long serialVersionUID = -1624078661634226968L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java
index 99810221f52d..9ec0e4c07111 100644
--- a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java
+++ b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<AnotherStruct> ice_read(com.zeroc.Ice.InputStre
     private static final AnotherStruct _nullMarshalValue = new AnotherStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2723844430899264240L;
+    private static final long serialVersionUID = 2723850578135067785L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java
index e824ff5e685c..a2f33dec7ae2 100644
--- a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java
+++ b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 820419452852534431L;
+    private static final long serialVersionUID = -5460589959444860346L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java
index 4134a2376495..9bf2e8873848 100644
--- a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java
+++ b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java
@@ -148,5 +148,5 @@ static public java.util.Optional<MyStruct> ice_read(com.zeroc.Ice.InputStream is
     private static final MyStruct _nullMarshalValue = new MyStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -1658491259974795747L;
+    private static final long serialVersionUID = -8236645893469652483L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java
index cbae1ef7f3d9..3854544620c7 100644
--- a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java
+++ b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java
@@ -170,5 +170,5 @@ static public java.util.Optional<MyStruct1> ice_read(com.zeroc.Ice.InputStream i
     private static final MyStruct1 _nullMarshalValue = new MyStruct1();
 
     /** @hidden */
-    private static final long serialVersionUID = -8264081044623190538L;
+    private static final long serialVersionUID = 282377587841885871L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/Structure.java b/slice2java/matlab/test/Ice/operations/Test/Structure.java
index 1f202b82ef71..2e4b6717dad7 100644
--- a/slice2java/matlab/test/Ice/operations/Test/Structure.java
+++ b/slice2java/matlab/test/Ice/operations/Test/Structure.java
@@ -170,5 +170,5 @@ static public java.util.Optional<Structure> ice_read(com.zeroc.Ice.InputStream i
     private static final Structure _nullMarshalValue = new Structure();
 
     /** @hidden */
-    private static final long serialVersionUID = 8475681110864457502L;
+    private static final long serialVersionUID = -7548603818421417721L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/A.java b/slice2java/matlab/test/Ice/optional/Test/A.java
index cf6d1ee8a6b4..7896afe43768 100644
--- a/slice2java/matlab/test/Ice/optional/Test/A.java
+++ b/slice2java/matlab/test/Ice/optional/Test/A.java
@@ -212,7 +212,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5813482599587843824L;
+    private static final long serialVersionUID = 4623882470681482896L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/B.java b/slice2java/matlab/test/Ice/optional/Test/B.java
index bc1edfc7f933..1bad5a826b6d 100644
--- a/slice2java/matlab/test/Ice/optional/Test/B.java
+++ b/slice2java/matlab/test/Ice/optional/Test/B.java
@@ -107,7 +107,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6541591556592403741L;
+    private static final long serialVersionUID = 2503272830402519139L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/C.java b/slice2java/matlab/test/Ice/optional/Test/C.java
index b66760db56f8..b4a629650073 100644
--- a/slice2java/matlab/test/Ice/optional/Test/C.java
+++ b/slice2java/matlab/test/Ice/optional/Test/C.java
@@ -110,7 +110,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2618421348394926467L;
+    private static final long serialVersionUID = -8507907191013061123L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java
index 60ac9672543c..7b193abcf4e1 100644
--- a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4430976860106500851L;
+    private static final long serialVersionUID = 2476415002500531283L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/E.java b/slice2java/matlab/test/Ice/optional/Test/E.java
index fa4498e47350..29d431ec22da 100644
--- a/slice2java/matlab/test/Ice/optional/Test/E.java
+++ b/slice2java/matlab/test/Ice/optional/Test/E.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1850730982942861426L;
+    private static final long serialVersionUID = -1850732089889550740L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/F.java b/slice2java/matlab/test/Ice/optional/Test/F.java
index 6958b0243161..7890162744c4 100644
--- a/slice2java/matlab/test/Ice/optional/Test/F.java
+++ b/slice2java/matlab/test/Ice/optional/Test/F.java
@@ -105,7 +105,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6430490071618915459L;
+    private static final long serialVersionUID = -6430493737923782625L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java
index 80e58ea2f3f6..975a75bcd9ef 100644
--- a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java
+++ b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<FixedStruct> ice_read(com.zeroc.Ice.InputStream
     private static final FixedStruct _nullMarshalValue = new FixedStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 1569609674276955242L;
+    private static final long serialVersionUID = 1569614188029073673L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/G.java b/slice2java/matlab/test/Ice/optional/Test/G.java
index 8c78dbc059a5..818636d5d7f4 100644
--- a/slice2java/matlab/test/Ice/optional/Test/G.java
+++ b/slice2java/matlab/test/Ice/optional/Test/G.java
@@ -168,7 +168,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1435934960689430419L;
+    private static final long serialVersionUID = 8366583837091934355L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/G1.java b/slice2java/matlab/test/Ice/optional/Test/G1.java
index 1f69ffcf9c2f..727fd9c6a1da 100644
--- a/slice2java/matlab/test/Ice/optional/Test/G1.java
+++ b/slice2java/matlab/test/Ice/optional/Test/G1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<G1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G1 _nullMarshalValue = new G1();
 
     /** @hidden */
-    private static final long serialVersionUID = 7339787378769025661L;
+    private static final long serialVersionUID = 7339783030380000989L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/G2.java b/slice2java/matlab/test/Ice/optional/Test/G2.java
index 8f316d82d54a..11ed6f6884b2 100644
--- a/slice2java/matlab/test/Ice/optional/Test/G2.java
+++ b/slice2java/matlab/test/Ice/optional/Test/G2.java
@@ -138,5 +138,5 @@ static public java.util.Optional<G2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G2 _nullMarshalValue = new G2();
 
     /** @hidden */
-    private static final long serialVersionUID = 3824559630405255979L;
+    private static final long serialVersionUID = 3824557841561321723L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java
index 90dfb6d481cf..ddaebf9a1aa4 100644
--- a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java
+++ b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java
@@ -1675,7 +1675,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4921530714041755235L;
+    private static final long serialVersionUID = 9164918714341257283L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java
index ae6da47a4b08..fb787afa67e2 100644
--- a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java
+++ b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java
@@ -96,7 +96,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7219607433734864508L;
+    private static final long serialVersionUID = -7219609222488313945L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java
index 85870f0e3460..b0ce55a4eb87 100644
--- a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1430829269693044252L;
+    private static final long serialVersionUID = 6065028542046600034L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java
index b1a48ddd25f3..ab342d3029a4 100644
--- a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java
+++ b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java
@@ -186,7 +186,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3590638204357061947L;
+    private static final long serialVersionUID = 2162665388488115515L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java
index 81a6de59fb8c..17de8ce2b6d8 100644
--- a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894241399646308852L;
+    private static final long serialVersionUID = 2894245913317027732L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java
index 48eca4a23e67..7863650489c0 100644
--- a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java
+++ b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<SmallStruct> ice_read(com.zeroc.Ice.InputStream
     private static final SmallStruct _nullMarshalValue = new SmallStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 6700996122577172299L;
+    private static final long serialVersionUID = 6700991774230799149L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java
index 03c893cdac7a..cee3b8090d0a 100644
--- a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java
+++ b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<VarStruct> ice_read(com.zeroc.Ice.InputStream i
     private static final VarStruct _nullMarshalValue = new VarStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -1912281488815135755L;
+    private static final long serialVersionUID = -1912285155309647787L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/WD.java b/slice2java/matlab/test/Ice/optional/Test/WD.java
index a5e36ecd2d4b..29ba36c0ddd2 100644
--- a/slice2java/matlab/test/Ice/optional/Test/WD.java
+++ b/slice2java/matlab/test/Ice/optional/Test/WD.java
@@ -152,7 +152,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7686039972384550329L;
+    private static final long serialVersionUID = -5126588650736400486L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java
index 87c9dd8a9ceb..46875ffaa5e8 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477022439520682534L;
+    private static final long serialVersionUID = -477024219161774115L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java
index f30dd8f8a3d6..a4d0383ec2f4 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8435635245635885410L;
+    private static final long serialVersionUID = -8435636704987885159L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 3145f3e4d20f..2c71af1d3bf9 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485215791229104124L;
+    private static final long serialVersionUID = 3485213996109384571L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 62abd785b2f7..115240a64caf 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717376386993458189L;
+    private static final long serialVersionUID = 1717377815526034826L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 34c1fef88bd9..96a824abe3a5 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384911904260654508L;
+    private static final long serialVersionUID = -7384918136897238061L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java
index 7fd9fa4f1b2d..1aa440430f45 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2733708541186421871L;
+    private static final long serialVersionUID = -2733706751072678634L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
index c6f70e4fec27..0c9ba1fd4cd7 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4528102730753741400L;
+    private static final long serialVersionUID = 4528095495947213791L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java
index 0c085b5bbd71..144d74249f60 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java
@@ -62,5 +62,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6137356768988253945L;
+    private static final long serialVersionUID = 6137357877160796358L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java
index aa21eec6692b..c5c3e83d395b 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 751744773327374489L;
+    private static final long serialVersionUID = 751740100580808934L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java
index a5898984c1f0..4c6e59359a66 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4272732973847954592L;
+    private static final long serialVersionUID = -4272734407384277273L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/B.java b/slice2java/matlab/test/Ice/slicing/objects/Test/B.java
index 78982d4cf5e3..201ed6b36e22 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/B.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/B.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -331346651159335599L;
+    private static final long serialVersionUID = 3132899183391746939L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java
index 690ab257af8b..b43d34c1b052 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3624179962655186333L;
+    private static final long serialVersionUID = 7063756287299292855L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java
index b070bda0c1a2..6d4f4f288b6d 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6396997405433476296L;
+    private static final long serialVersionUID = -6397001774713878113L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java
index b7c2c217d7fd..cdd15d852528 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9066888562898036049L;
+    private static final long serialVersionUID = -9066881381111970825L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java b/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java
index 00ddc8a5b027..9d139ab94648 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/D1.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -245665980954557166L;
+    private static final long serialVersionUID = 7912040664300913336L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java b/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java
index 5c3598ee8c67..0d70140b0e52 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/D3.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2381554217985926864L;
+    private static final long serialVersionUID = -4003362706923568134L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java
index eefc6093455b..61f48a18c726 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2404252332858837998L;
+    private static final long serialVersionUID = -5274085706414964876L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java
index 986e6a7e6817..cef1ebed164d 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7655926912749949836L;
+    private static final long serialVersionUID = -7655923204879144804L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java
index 7edda56ccd08..0b22677326d3 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Hidden.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2271124947298568522L;
+    private static final long serialVersionUID = -2271128655039170159L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java
index 10bc1bc77171..505aac92d7f0 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PBase.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 481712807168095262L;
+    private static final long serialVersionUID = 481709099194130797L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java
index b7787b4c64b7..ab5105754a6a 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4426882432572866696L;
+    private static final long serialVersionUID = -4426886801540472865L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java
index 0165bb9e541c..3ddbb6295529 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 850540280004531139L;
+    private static final long serialVersionUID = 850538537974039792L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java
index 7c66242db14f..637adf315eca 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCDerived3.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4328908053883872406L;
+    private static final long serialVersionUID = -4328898885922244931L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java
index 6f77e577845d..9078eedc0449 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PCUnknown.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5081806500297285679L;
+    private static final long serialVersionUID = -5081818481178469113L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java
index f3e08079c554..a56591a6e0c6 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 643086099261926376L;
+    private static final long serialVersionUID = 643079578710404912L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java b/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java
index f2174c5c758e..138773680283 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/PNode.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2438000518841550552L;
+    private static final long serialVersionUID = -2438007710736443149L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java
index 098b8ad567b0..3fe6b606e770 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/Preserved.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3651533168017783704L;
+    private static final long serialVersionUID = 3651528798901326542L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java
index 5531fe8355b5..ae7d80893426 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SBSKnownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8804372664805164733L;
+    private static final long serialVersionUID = 8804376382875367019L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java
index f64b2ca13285..45e276f90f6c 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SBase.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5353754039265569589L;
+    private static final long serialVersionUID = -5353761231361467235L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java
index b4d3acfca319..9bd0ca4c65b9 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6522141634923429528L;
+    private static final long serialVersionUID = -6522135114122883359L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java
index c1392f952cfe..2b0a16ed0f9e 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS2.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7620283637211225131L;
+    private static final long serialVersionUID = 7620287355210965282L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java b/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java
index ffc6db0d5a2f..809a382c75df 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/SS3.java
@@ -155,5 +155,5 @@ static public java.util.Optional<SS3> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final SS3 _nullMarshalValue = new SS3();
 
     /** @hidden */
-    private static final long serialVersionUID = -2047174616111636582L;
+    private static final long serialVersionUID = 7953259078941413908L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java
index e31ac7e75964..ea9b55d2aeb1 100644
--- a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java
+++ b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7995433542736795091L;
+    private static final long serialVersionUID = -8707236328348369107L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java b/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java
index b285110f9a42..c24e799ca764 100644
--- a/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java
+++ b/slice2java/matlab/test/Slice/escape/classdef/_break/bitor.java
@@ -176,5 +176,5 @@ static public java.util.Optional<bitor> ice_read(com.zeroc.Ice.InputStream istr,
     private static final bitor _nullMarshalValue = new bitor();
 
     /** @hidden */
-    private static final long serialVersionUID = 6052345231344891924L;
+    private static final long serialVersionUID = 2258143723998930158L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java
index 4119d5fe14d1..03300ae8cd18 100644
--- a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java
+++ b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2421488033043065390L;
+    private static final long serialVersionUID = 2421492617852180330L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java
index 2bad351048c0..8f67ee5982d9 100644
--- a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java
+++ b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -976632516279888305L;
+    private static final long serialVersionUID = -7240634293813606033L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java b/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java
index 0a201884eaf2..e90d7d337814 100644
--- a/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java
+++ b/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java
@@ -89,5 +89,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3153622542963948889L;
+    private static final long serialVersionUID = 4856136057529350384L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java
index 374399a65b47..b8a1b56e76be 100644
--- a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java
+++ b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java
@@ -57,7 +57,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4937822022644778770L;
+    private static final long serialVersionUID = -6515034795302553980L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java b/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java
index c4cfc625c8e4..0885f6a1bc7a 100644
--- a/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java
+++ b/slice2java/matlab/test/Slice/escape/classdef/_break/xor.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1008954911126810481L;
+    private static final long serialVersionUID = -1008947433353546037L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Base.java b/slice2java/php/test/Ice/defaultValue/Test/Base.java
index fd920ccaf196..186cc4c2c476 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/Base.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/Base.java
@@ -106,7 +106,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4707777478093829833L;
+    private static final long serialVersionUID = 1178485493104177687L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java
index d663d1e7bde1..62d94ee256c2 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -990579973487088519L;
+    private static final long serialVersionUID = 508546570262769081L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 715328237def..cfc3a3e77941 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -702651992223800623L;
+    private static final long serialVersionUID = 1549447276371773280L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Derived.java b/slice2java/php/test/Ice/defaultValue/Test/Derived.java
index 9f661b7fd6cb..edcd20444234 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/Derived.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/Derived.java
@@ -68,7 +68,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9155085161615887879L;
+    private static final long serialVersionUID = -2897018455601278727L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java
index 85089feb8ac5..6595bc69a7ba 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<InnerStruct> ice_read(com.zeroc.Ice.InputStream
     private static final InnerStruct _nullMarshalValue = new InnerStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 5127388699352234423L;
+    private static final long serialVersionUID = 5127387565476672262L;
 }
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java
index 16224619eb88..372ef06b331d 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct1> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct1 _nullMarshalValue = new Struct1();
 
     /** @hidden */
-    private static final long serialVersionUID = -8915922773790442130L;
+    private static final long serialVersionUID = -9088622910221777874L;
 }
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java
index 64ca48d37e93..adfb7bee6d27 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java
@@ -370,5 +370,5 @@ static public java.util.Optional<Struct2> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct2 _nullMarshalValue = new Struct2();
 
     /** @hidden */
-    private static final long serialVersionUID = 4462653535676290794L;
+    private static final long serialVersionUID = 6308267595491904970L;
 }
diff --git a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java
index 17cff6d32095..7e73aeabe39c 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java
@@ -274,5 +274,5 @@ static public java.util.Optional<StructNoDefaults> ice_read(com.zeroc.Ice.InputS
     private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults();
 
     /** @hidden */
-    private static final long serialVersionUID = 7319769809874369825L;
+    private static final long serialVersionUID = -239673683051312304L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/A.java b/slice2java/php/test/Ice/exceptions/Test/A.java
index 56d69f057667..b89dbb2ae990 100644
--- a/slice2java/php/test/Ice/exceptions/Test/A.java
+++ b/slice2java/php/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823745283413777712L;
+    private static final long serialVersionUID = 7823741835317416295L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/B.java b/slice2java/php/test/Ice/exceptions/Test/B.java
index 3204efce974c..bee902f60ace 100644
--- a/slice2java/php/test/Ice/exceptions/Test/B.java
+++ b/slice2java/php/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861410449942135568L;
+    private static final long serialVersionUID = -3861419353199198297L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/C.java b/slice2java/php/test/Ice/exceptions/Test/C.java
index ed773b75470a..1af0f2c22693 100644
--- a/slice2java/php/test/Ice/exceptions/Test/C.java
+++ b/slice2java/php/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080698974616562992L;
+    private static final long serialVersionUID = 1080695526520201575L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/D.java b/slice2java/php/test/Ice/exceptions/Test/D.java
index b7485918aae5..a0e49b6d4269 100644
--- a/slice2java/php/test/Ice/exceptions/Test/D.java
+++ b/slice2java/php/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780381818159942640L;
+    private static final long serialVersionUID = 4780372914902879911L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/A.java b/slice2java/php/test/Ice/objects/Test/A.java
index bdd4f82cf0f3..4e5b3cb9ce67 100644
--- a/slice2java/php/test/Ice/objects/Test/A.java
+++ b/slice2java/php/test/Ice/objects/Test/A.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8848683245888346920L;
+    private static final long serialVersionUID = 7709395262218635931L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/A1.java b/slice2java/php/test/Ice/objects/Test/A1.java
index ac627597b946..e15819c2ac24 100644
--- a/slice2java/php/test/Ice/objects/Test/A1.java
+++ b/slice2java/php/test/Ice/objects/Test/A1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5926739405001291395L;
+    private static final long serialVersionUID = -5926752119432270956L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/B.java b/slice2java/php/test/Ice/objects/Test/B.java
index 26eb5819fff8..4cec3ed58f94 100644
--- a/slice2java/php/test/Ice/objects/Test/B.java
+++ b/slice2java/php/test/Ice/objects/Test/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8890911736765409370L;
+    private static final long serialVersionUID = -8890917712520841222L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/B1.java b/slice2java/php/test/Ice/objects/Test/B1.java
index 4a5346cca378..c1afa90fb9dd 100644
--- a/slice2java/php/test/Ice/objects/Test/B1.java
+++ b/slice2java/php/test/Ice/objects/Test/B1.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 747450433829041412L;
+    private static final long serialVersionUID = 3489393293395606468L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/Base.java b/slice2java/php/test/Ice/objects/Test/Base.java
index 91ae3d21c741..c52f98a35c58 100644
--- a/slice2java/php/test/Ice/objects/Test/Base.java
+++ b/slice2java/php/test/Ice/objects/Test/Base.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3731453573497899210L;
+    private static final long serialVersionUID = -6168472009185568466L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/C.java b/slice2java/php/test/Ice/objects/Test/C.java
index 71e3926c6b04..62ff4d0cec86 100644
--- a/slice2java/php/test/Ice/objects/Test/C.java
+++ b/slice2java/php/test/Ice/objects/Test/C.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2146229113070239984L;
+    private static final long serialVersionUID = 4839167565609276061L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/COneMember.java b/slice2java/php/test/Ice/objects/Test/COneMember.java
index c87664d27ec7..89350ae6344f 100644
--- a/slice2java/php/test/Ice/objects/Test/COneMember.java
+++ b/slice2java/php/test/Ice/objects/Test/COneMember.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3050964967285983843L;
+    private static final long serialVersionUID = 3050970943158443667L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java
index 9ab52f71dc95..b41d69190102 100644
--- a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java
+++ b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6554145307927588197L;
+    private static final long serialVersionUID = -4089876526996856101L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/D.java b/slice2java/php/test/Ice/objects/Test/D.java
index 3097e751ef70..a90564fc8a20 100644
--- a/slice2java/php/test/Ice/objects/Test/D.java
+++ b/slice2java/php/test/Ice/objects/Test/D.java
@@ -57,7 +57,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8914744350069021782L;
+    private static final long serialVersionUID = 7814707551443264197L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/D1.java b/slice2java/php/test/Ice/objects/Test/D1.java
index c4529c7d68de..f97fa8c66406 100644
--- a/slice2java/php/test/Ice/objects/Test/D1.java
+++ b/slice2java/php/test/Ice/objects/Test/D1.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 439085654427831747L;
+    private static final long serialVersionUID = 5417424865892090243L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/E.java b/slice2java/php/test/Ice/objects/Test/E.java
index 1ad3885af01e..9c47b7a88264 100644
--- a/slice2java/php/test/Ice/objects/Test/E.java
+++ b/slice2java/php/test/Ice/objects/Test/E.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8489665254273772326L;
+    private static final long serialVersionUID = 2238681457285263934L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/EBase.java b/slice2java/php/test/Ice/objects/Test/EBase.java
index e11bab55fd16..32587a29141f 100644
--- a/slice2java/php/test/Ice/objects/Test/EBase.java
+++ b/slice2java/php/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3281433093187533518L;
+    private static final long serialVersionUID = -5952470953432870770L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/EDerived.java b/slice2java/php/test/Ice/objects/Test/EDerived.java
index f4688cb0b714..d7e58d5110e8 100644
--- a/slice2java/php/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/php/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3243552776731407698L;
+    private static final long serialVersionUID = -5370552220150402798L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/EOneMember.java b/slice2java/php/test/Ice/objects/Test/EOneMember.java
index ca4c1dafd415..18a1cde37cae 100644
--- a/slice2java/php/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/php/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225280149669962068L;
+    private static final long serialVersionUID = -6225292864002156644L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java
index 57763e433f80..c2f46479c4eb 100644
--- a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6201515782425135636L;
+    private static final long serialVersionUID = 5042609875323070164L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/F.java b/slice2java/php/test/Ice/objects/Test/F.java
index 75ef7b65dbdc..7950957a7cff 100644
--- a/slice2java/php/test/Ice/objects/Test/F.java
+++ b/slice2java/php/test/Ice/objects/Test/F.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2929997786063837009L;
+    private static final long serialVersionUID = -245264978539442351L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/F1.java b/slice2java/php/test/Ice/objects/Test/F1.java
index 67fe82660940..a1b9057e05b3 100644
--- a/slice2java/php/test/Ice/objects/Test/F1.java
+++ b/slice2java/php/test/Ice/objects/Test/F1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6192372703561888260L;
+    private static final long serialVersionUID = 6192380909544164074L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/F3.java b/slice2java/php/test/Ice/objects/Test/F3.java
index 98c30540e883..708144dd8a36 100644
--- a/slice2java/php/test/Ice/objects/Test/F3.java
+++ b/slice2java/php/test/Ice/objects/Test/F3.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3222877164142483534L;
+    private static final long serialVersionUID = 6622856797280178451L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/K.java b/slice2java/php/test/Ice/objects/Test/K.java
index e98a2bf83214..ad7afd9ca3a8 100644
--- a/slice2java/php/test/Ice/objects/Test/K.java
+++ b/slice2java/php/test/Ice/objects/Test/K.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4645160650707765829L;
+    private static final long serialVersionUID = 4645167910173836017L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/L.java b/slice2java/php/test/Ice/objects/Test/L.java
index 85f14914c45a..e54e7706430a 100644
--- a/slice2java/php/test/Ice/objects/Test/L.java
+++ b/slice2java/php/test/Ice/objects/Test/L.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6629743277469608694L;
+    private static final long serialVersionUID = 6629744118305473119L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/Recursive.java b/slice2java/php/test/Ice/objects/Test/Recursive.java
index 1e237eb86a37..d38d695788a3 100644
--- a/slice2java/php/test/Ice/objects/Test/Recursive.java
+++ b/slice2java/php/test/Ice/objects/Test/Recursive.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3617887325833746840L;
+    private static final long serialVersionUID = 3617883995276373420L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/S.java b/slice2java/php/test/Ice/objects/Test/S.java
index 2815f4dfa62d..d4e61541b84d 100644
--- a/slice2java/php/test/Ice/objects/Test/S.java
+++ b/slice2java/php/test/Ice/objects/Test/S.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 481773159898965317L;
+    private static final long serialVersionUID = 481772639375478892L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/SOneMember.java b/slice2java/php/test/Ice/objects/Test/SOneMember.java
index a44cae76572e..5a40c819ed17 100644
--- a/slice2java/php/test/Ice/objects/Test/SOneMember.java
+++ b/slice2java/php/test/Ice/objects/Test/SOneMember.java
@@ -142,5 +142,5 @@ static public java.util.Optional<SOneMember> ice_read(com.zeroc.Ice.InputStream
     private static final SOneMember _nullMarshalValue = new SOneMember();
 
     /** @hidden */
-    private static final long serialVersionUID = 6227749185870567226L;
+    private static final long serialVersionUID = 6227753800490838026L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/STwoMembers.java b/slice2java/php/test/Ice/objects/Test/STwoMembers.java
index 600879cb656f..f3ec7d6d703a 100644
--- a/slice2java/php/test/Ice/objects/Test/STwoMembers.java
+++ b/slice2java/php/test/Ice/objects/Test/STwoMembers.java
@@ -155,5 +155,5 @@ static public java.util.Optional<STwoMembers> ice_read(com.zeroc.Ice.InputStream
     private static final STwoMembers _nullMarshalValue = new STwoMembers();
 
     /** @hidden */
-    private static final long serialVersionUID = -8568685008419193982L;
+    private static final long serialVersionUID = 2533408950620147010L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java
index 19b67c6bf46f..759634541fb2 100644
--- a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java
+++ b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<AnotherStruct> ice_read(com.zeroc.Ice.InputStre
     private static final AnotherStruct _nullMarshalValue = new AnotherStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2723846690803834536L;
+    private static final long serialVersionUID = 2723848559808896146L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/MyClass1.java b/slice2java/php/test/Ice/operations/Test/MyClass1.java
index 449034e056e5..4365b5d86350 100644
--- a/slice2java/php/test/Ice/operations/Test/MyClass1.java
+++ b/slice2java/php/test/Ice/operations/Test/MyClass1.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1683972926444680258L;
+    private static final long serialVersionUID = 8796191494780192516L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/operations/Test/MyStruct1.java b/slice2java/php/test/Ice/operations/Test/MyStruct1.java
index 7ecd6c94b2c9..0884fba4a803 100644
--- a/slice2java/php/test/Ice/operations/Test/MyStruct1.java
+++ b/slice2java/php/test/Ice/operations/Test/MyStruct1.java
@@ -170,5 +170,5 @@ static public java.util.Optional<MyStruct1> ice_read(com.zeroc.Ice.InputStream i
     private static final MyStruct1 _nullMarshalValue = new MyStruct1();
 
     /** @hidden */
-    private static final long serialVersionUID = -806613305459240073L;
+    private static final long serialVersionUID = 3989267676291006221L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/Structure.java b/slice2java/php/test/Ice/operations/Test/Structure.java
index caaceb8ffa95..a2230dd1255a 100644
--- a/slice2java/php/test/Ice/operations/Test/Structure.java
+++ b/slice2java/php/test/Ice/operations/Test/Structure.java
@@ -170,5 +170,5 @@ static public java.util.Optional<Structure> ice_read(com.zeroc.Ice.InputStream i
     private static final Structure _nullMarshalValue = new Structure();
 
     /** @hidden */
-    private static final long serialVersionUID = 329910303384607933L;
+    private static final long serialVersionUID = -8869066637015998073L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/A.java b/slice2java/php/test/Ice/optional/Test/A.java
index 43ba31246067..8776c22637af 100644
--- a/slice2java/php/test/Ice/optional/Test/A.java
+++ b/slice2java/php/test/Ice/optional/Test/A.java
@@ -212,7 +212,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4412636043503982960L;
+    private static final long serialVersionUID = 6831848157434278032L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/B.java b/slice2java/php/test/Ice/optional/Test/B.java
index fc8845535f81..e3d3e8158359 100644
--- a/slice2java/php/test/Ice/optional/Test/B.java
+++ b/slice2java/php/test/Ice/optional/Test/B.java
@@ -107,7 +107,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5756237165063988579L;
+    private static final long serialVersionUID = 6811612957625453795L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/C.java b/slice2java/php/test/Ice/optional/Test/C.java
index 6fef552dc461..abef0c51f1d9 100644
--- a/slice2java/php/test/Ice/optional/Test/C.java
+++ b/slice2java/php/test/Ice/optional/Test/C.java
@@ -110,7 +110,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8188123064024678019L;
+    private static final long serialVersionUID = -3825658688001567491L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/DerivedException.java b/slice2java/php/test/Ice/optional/Test/DerivedException.java
index ed0ab4e28de1..87f4068ad914 100644
--- a/slice2java/php/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/php/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3261130396351622358L;
+    private static final long serialVersionUID = -7544567021409516189L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/E.java b/slice2java/php/test/Ice/optional/Test/E.java
index 7b5f8a95c6cd..716ad9c650fb 100644
--- a/slice2java/php/test/Ice/optional/Test/E.java
+++ b/slice2java/php/test/Ice/optional/Test/E.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1850740466304934957L;
+    private static final long serialVersionUID = -1850739531394900122L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/F.java b/slice2java/php/test/Ice/optional/Test/F.java
index 29af1fc1183a..934061434cca 100644
--- a/slice2java/php/test/Ice/optional/Test/F.java
+++ b/slice2java/php/test/Ice/optional/Test/F.java
@@ -105,7 +105,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6430496953738957024L;
+    private static final long serialVersionUID = -6430492753772364523L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/FixedStruct.java b/slice2java/php/test/Ice/optional/Test/FixedStruct.java
index b25cfc8041fe..c92458e80f49 100644
--- a/slice2java/php/test/Ice/optional/Test/FixedStruct.java
+++ b/slice2java/php/test/Ice/optional/Test/FixedStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<FixedStruct> ice_read(com.zeroc.Ice.InputStream
     private static final FixedStruct _nullMarshalValue = new FixedStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 1569605607368292334L;
+    private static final long serialVersionUID = 1569601291436368027L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/G.java b/slice2java/php/test/Ice/optional/Test/G.java
index 16b24f519332..2175bea586e0 100644
--- a/slice2java/php/test/Ice/optional/Test/G.java
+++ b/slice2java/php/test/Ice/optional/Test/G.java
@@ -168,7 +168,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5633034477683285741L;
+    private static final long serialVersionUID = -8018908117137251181L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/G1.java b/slice2java/php/test/Ice/optional/Test/G1.java
index 5e66fc302644..9b246c3a9146 100644
--- a/slice2java/php/test/Ice/optional/Test/G1.java
+++ b/slice2java/php/test/Ice/optional/Test/G1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<G1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G1 _nullMarshalValue = new G1();
 
     /** @hidden */
-    private static final long serialVersionUID = 7339780700481340120L;
+    private static final long serialVersionUID = 7339784696318700525L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/G2.java b/slice2java/php/test/Ice/optional/Test/G2.java
index 492afde47d9a..b3b915d5f4d9 100644
--- a/slice2java/php/test/Ice/optional/Test/G2.java
+++ b/slice2java/php/test/Ice/optional/Test/G2.java
@@ -138,5 +138,5 @@ static public java.util.Optional<G2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G2 _nullMarshalValue = new G2();
 
     /** @hidden */
-    private static final long serialVersionUID = 3824550147038602572L;
+    private static final long serialVersionUID = 3824551081950628217L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/MultiOptional.java b/slice2java/php/test/Ice/optional/Test/MultiOptional.java
index 7f45a0dc7530..b2a3eb43e91a 100644
--- a/slice2java/php/test/Ice/optional/Test/MultiOptional.java
+++ b/slice2java/php/test/Ice/optional/Test/MultiOptional.java
@@ -1675,7 +1675,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5092745131740791098L;
+    private static final long serialVersionUID = -6358763199324803473L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/OneOptional.java b/slice2java/php/test/Ice/optional/Test/OneOptional.java
index 612701a72d0b..bce97788ce20 100644
--- a/slice2java/php/test/Ice/optional/Test/OneOptional.java
+++ b/slice2java/php/test/Ice/optional/Test/OneOptional.java
@@ -96,7 +96,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7219600760795744768L;
+    private static final long serialVersionUID = -7219599136126391243L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/OptionalException.java b/slice2java/php/test/Ice/optional/Test/OptionalException.java
index ba33a39c1730..423b0dc4af73 100644
--- a/slice2java/php/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/php/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 929477978698302874L;
+    private static final long serialVersionUID = -5888850588519631857L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java
index 925919d53298..9131f30b3aee 100644
--- a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java
+++ b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java
@@ -186,7 +186,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7627432130717402949L;
+    private static final long serialVersionUID = -6087571231535436101L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/RequiredException.java b/slice2java/php/test/Ice/optional/Test/RequiredException.java
index 84ad8cba70ee..1665a7c6a0e0 100644
--- a/slice2java/php/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/php/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894242821445792273L;
+    private static final long serialVersionUID = 2894238632110967524L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/SmallStruct.java b/slice2java/php/test/Ice/optional/Test/SmallStruct.java
index a00bef410e37..e67b0446b5ca 100644
--- a/slice2java/php/test/Ice/optional/Test/SmallStruct.java
+++ b/slice2java/php/test/Ice/optional/Test/SmallStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<SmallStruct> ice_read(com.zeroc.Ice.InputStream
     private static final SmallStruct _nullMarshalValue = new SmallStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 6700983955465241884L;
+    private static final long serialVersionUID = 6700987824817055657L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/VarStruct.java b/slice2java/php/test/Ice/optional/Test/VarStruct.java
index 1e353642e64b..a781237d7be9 100644
--- a/slice2java/php/test/Ice/optional/Test/VarStruct.java
+++ b/slice2java/php/test/Ice/optional/Test/VarStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<VarStruct> ice_read(com.zeroc.Ice.InputStream i
     private static final VarStruct _nullMarshalValue = new VarStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -1912288167102821296L;
+    private static final long serialVersionUID = -1912284171265460891L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/WD.java b/slice2java/php/test/Ice/optional/Test/WD.java
index 03c78777dffa..8cd2b9956f9a 100644
--- a/slice2java/php/test/Ice/optional/Test/WD.java
+++ b/slice2java/php/test/Ice/optional/Test/WD.java
@@ -152,7 +152,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7092385176663375384L;
+    private static final long serialVersionUID = 9046773004745258168L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C.java b/slice2java/php/test/Ice/scope/Test/C.java
index fd032c86cb2b..fe4eff4ca3d3 100644
--- a/slice2java/php/test/Ice/scope/Test/C.java
+++ b/slice2java/php/test/Ice/scope/Test/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5190247365606726493L;
+    private static final long serialVersionUID = -5190248434942928879L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C1.java b/slice2java/php/test/Ice/scope/Test/C1.java
index ba940ddd46b5..f249a0d6323b 100644
--- a/slice2java/php/test/Ice/scope/Test/C1.java
+++ b/slice2java/php/test/Ice/scope/Test/C1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8893232947555717026L;
+    private static final long serialVersionUID = 8893234853753704528L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C2.java b/slice2java/php/test/Ice/scope/Test/C2.java
index 6805184d1524..6764f26b8c68 100644
--- a/slice2java/php/test/Ice/scope/Test/C2.java
+++ b/slice2java/php/test/Ice/scope/Test/C2.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3334294726013874915L;
+    private static final long serialVersionUID = 8121158542802381436L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/Inner/C.java b/slice2java/php/test/Ice/scope/Test/Inner/C.java
index 033ca3786597..5b081d91cc94 100644
--- a/slice2java/php/test/Ice/scope/Test/Inner/C.java
+++ b/slice2java/php/test/Ice/scope/Test/Inner/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4615623095623321339L;
+    private static final long serialVersionUID = 4615626644585238320L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java
index 2aced3b3becb..c606c77c3d2b 100644
--- a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java
+++ b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 672588618999391359L;
+    private static final long serialVersionUID = 672593500619561708L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java
index bdd268bc5349..f1f69b347b74 100644
--- a/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java
+++ b/slice2java/php/test/Ice/scope/Test/Inner/Inner2/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 8654439356384148615L;
+    private static final long serialVersionUID = 8654437780798115661L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/Inner/S.java b/slice2java/php/test/Ice/scope/Test/Inner/S.java
index c71d3de04aa1..fb80d25fb2f5 100644
--- a/slice2java/php/test/Ice/scope/Test/Inner/S.java
+++ b/slice2java/php/test/Ice/scope/Test/Inner/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 3694621348386619083L;
+    private static final long serialVersionUID = 3694620444354147201L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S.java b/slice2java/php/test/Ice/scope/Test/S.java
index 3a7f5a5de75b..7f7613430ad7 100644
--- a/slice2java/php/test/Ice/scope/Test/S.java
+++ b/slice2java/php/test/Ice/scope/Test/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 2159697536633672117L;
+    private static final long serialVersionUID = 2159700920284644479L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S1.java b/slice2java/php/test/Ice/scope/Test/S1.java
index b86e6f521020..8efee4fdda23 100644
--- a/slice2java/php/test/Ice/scope/Test/S1.java
+++ b/slice2java/php/test/Ice/scope/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = 1241674667145685019L;
+    private static final long serialVersionUID = 1241678701700503145L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S2.java b/slice2java/php/test/Ice/scope/Test/S2.java
index a3868456731f..96045599f4a0 100644
--- a/slice2java/php/test/Ice/scope/Test/S2.java
+++ b/slice2java/php/test/Ice/scope/Test/S2.java
@@ -170,5 +170,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = -9065505984124829030L;
+    private static final long serialVersionUID = -2775200995246008955L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java
index 17d222162c4c..cb1dfc9890f5 100644
--- a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477019731386885390L;
+    private static final long serialVersionUID = -477021614349307999L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 3344a04b9cd3..05701f5ef16d 100644
--- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485213044202343700L;
+    private static final long serialVersionUID = 3485210996092879815L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 6ab893fae6a1..f0f4d3199c2d 100644
--- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717373844166708453L;
+    private static final long serialVersionUID = 1717375727129409590L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 6647e5ffc06d..bf268bb19eba 100644
--- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384914485983823748L;
+    private static final long serialVersionUID = -7384921984248975569L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/B.java b/slice2java/php/test/Ice/slicing/objects/Test/B.java
index 317ffc7db863..ff3b80f91cfc 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/B.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/B.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5132467706483712105L;
+    private static final long serialVersionUID = 1139857890383017129L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java
index f8884f048d55..3e75f8e61f0c 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5821998699988109861L;
+    private static final long serialVersionUID = 354986642814125413L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 3b8ab150b8dc..7516344ea8a4 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6396997786500518517L;
+    private static final long serialVersionUID = -6397005162030459653L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java
index 3cca9998c8e2..539d9c251b78 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/CompactPDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9066881202886584248L;
+    private static final long serialVersionUID = -9066889505513438547L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/D1.java b/slice2java/php/test/Ice/slicing/objects/Test/D1.java
index eed6286fa080..746396fdb0ed 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/D1.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/D1.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7189258391388298314L;
+    private static final long serialVersionUID = -7619690271964392278L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/D3.java b/slice2java/php/test/Ice/slicing/objects/Test/D3.java
index 1f5f445192ad..c453f64b4a5f 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/D3.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/D3.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 122083938591779089L;
+    private static final long serialVersionUID = -2413421577586592047L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java
index c8e0288b404e..4efb4d4da515 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9191507047516185142L;
+    private static final long serialVersionUID = -223432083339912406L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java
index 1b3c1b84b540..aa5f76d61334 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7655923047307054729L;
+    private static final long serialVersionUID = -7655931430306140526L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java
index 771b37acf58a..cedb09ad15f6 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/Hidden.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2271128812602842129L;
+    private static final long serialVersionUID = -2271120595056195126L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PBase.java b/slice2java/php/test/Ice/slicing/objects/Test/PBase.java
index 87e614767337..0ea41e440b71 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/PBase.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/PBase.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 481708941569187775L;
+    private static final long serialVersionUID = 481717159106634906L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java
index 01802701f67f..d9f6c3de09d7 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4426882813630569653L;
+    private static final long serialVersionUID = -4426884734009009861L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java
index ce7b9a4e8ac6..1eae67e87ace 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 850539813865993810L;
+    private static final long serialVersionUID = 850536444382293602L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java
index bcf3c4f8b638..e200220c0a43 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/PCDerived3.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4328908354674976363L;
+    private static final long serialVersionUID = -4328902257767495643L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java
index 7c89de68b7c1..2fd50311bf35 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/PCUnknown.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5081806284714260093L;
+    private static final long serialVersionUID = -5081815109234426061L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java
index e7601b1847ab..77cf90e03fdf 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/PDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 643079421145126735L;
+    private static final long serialVersionUID = 643087889383337322L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/PNode.java b/slice2java/php/test/Ice/slicing/objects/Test/PNode.java
index c67a009a08ad..3c9afd497171 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/PNode.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/PNode.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2438007883929314109L;
+    private static final long serialVersionUID = -2438005036244533466L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java
index 89ea79b3324d..4297ccd827d2 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/Preserved.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3651528620694700601L;
+    private static final long serialVersionUID = 3651536838232139036L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java
index ab5ec6b8b147..16b8205c8eae 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/SBSKnownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8804376535275404444L;
+    private static final long serialVersionUID = 8804373772898667065L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SBase.java b/slice2java/php/test/Ice/slicing/objects/Test/SBase.java
index 932bf13b4220..fce42cf2d8b0 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/SBase.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/SBase.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5353761404406085078L;
+    private static final long serialVersionUID = -5353758556797065905L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SS1.java b/slice2java/php/test/Ice/slicing/objects/Test/SS1.java
index f3c28bac5132..8adf4775b71d 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/SS1.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/SS1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6522134956514178544L;
+    private static final long serialVersionUID = -6522143259438076939L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SS2.java b/slice2java/php/test/Ice/slicing/objects/Test/SS2.java
index 7ade44502c9b..f16ebbf730fe 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/SS2.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/SS2.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7620287507513502483L;
+    private static final long serialVersionUID = 7620284745138988854L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/SS3.java b/slice2java/php/test/Ice/slicing/objects/Test/SS3.java
index f4357b16eb02..4c94b5cddaf0 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/SS3.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/SS3.java
@@ -155,5 +155,5 @@ static public java.util.Optional<SS3> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final SS3 _nullMarshalValue = new SS3();
 
     /** @hidden */
-    private static final long serialVersionUID = 6767733194314720850L;
+    private static final long serialVersionUID = -9095335584705243694L;
 }
diff --git a/slice2java/php/test/Slice/escape/Clash/Cls.java b/slice2java/php/test/Slice/escape/Clash/Cls.java
index d5bb7dd3e9bb..30b839e05583 100644
--- a/slice2java/php/test/Slice/escape/Clash/Cls.java
+++ b/slice2java/php/test/Slice/escape/Clash/Cls.java
@@ -164,7 +164,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7249118572237787512L;
+    private static final long serialVersionUID = 6115495733659502793L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/escape/Clash/Ex.java b/slice2java/php/test/Slice/escape/Clash/Ex.java
index 4d3ca913ace5..6d55901d135e 100644
--- a/slice2java/php/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/php/test/Slice/escape/Clash/Ex.java
@@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5089005048210407516L;
+    private static final long serialVersionUID = -3346704174989636772L;
 }
diff --git a/slice2java/php/test/Slice/escape/Clash/St.java b/slice2java/php/test/Slice/escape/Clash/St.java
index 96d02b969ecf..bc1f55284b6c 100644
--- a/slice2java/php/test/Slice/escape/Clash/St.java
+++ b/slice2java/php/test/Slice/escape/Clash/St.java
@@ -187,5 +187,5 @@ static public java.util.Optional<St> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final St _nullMarshalValue = new St();
 
     /** @hidden */
-    private static final long serialVersionUID = 4128979480752584149L;
+    private static final long serialVersionUID = 1901639126162320340L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/echo.java b/slice2java/php/test/Slice/escape/and/echo.java
index d13b3f290136..8388547af115 100644
--- a/slice2java/php/test/Slice/escape/and/echo.java
+++ b/slice2java/php/test/Slice/escape/and/echo.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1606294646694541606L;
+    private static final long serialVersionUID = -8336379500595740525L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/escape/and/endif.java b/slice2java/php/test/Slice/escape/and/endif.java
index e0f789c1d510..3113cb57f8f5 100644
--- a/slice2java/php/test/Slice/escape/and/endif.java
+++ b/slice2java/php/test/Slice/escape/and/endif.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3766562608187266911L;
+    private static final long serialVersionUID = -3766562027027060151L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/endwhile.java b/slice2java/php/test/Slice/escape/and/endwhile.java
index 7bed624a8b86..0e6d486f89ab 100644
--- a/slice2java/php/test/Slice/escape/and/endwhile.java
+++ b/slice2java/php/test/Slice/escape/and/endwhile.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4355395740308473298L;
+    private static final long serialVersionUID = 3098211949484773230L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/xor.java b/slice2java/php/test/Slice/escape/and/xor.java
index 549940c4998b..17ba70af25dd 100644
--- a/slice2java/php/test/Slice/escape/and/xor.java
+++ b/slice2java/php/test/Slice/escape/and/xor.java
@@ -218,5 +218,5 @@ static public java.util.Optional<xor> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final xor _nullMarshalValue = new xor();
 
     /** @hidden */
-    private static final long serialVersionUID = 7838323811749675234L;
+    private static final long serialVersionUID = -576343295288235382L;
 }
diff --git a/slice2java/php/test/Slice/macros/Test/Default.java b/slice2java/php/test/Slice/macros/Test/Default.java
index 34d27706a7f5..5dba65a6531a 100644
--- a/slice2java/php/test/Slice/macros/Test/Default.java
+++ b/slice2java/php/test/Slice/macros/Test/Default.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6804195735727574046L;
+    private static final long serialVersionUID = -7225775368424840738L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/macros/Test/NoDefault.java b/slice2java/php/test/Slice/macros/Test/NoDefault.java
index 58d79f9a80d7..350294a5198f 100644
--- a/slice2java/php/test/Slice/macros/Test/NoDefault.java
+++ b/slice2java/php/test/Slice/macros/Test/NoDefault.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5738053913590934911L;
+    private static final long serialVersionUID = 4761241864877114175L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/structure/Test/C.java b/slice2java/php/test/Slice/structure/Test/C.java
index c4235c29d427..1e817ec05000 100644
--- a/slice2java/php/test/Slice/structure/Test/C.java
+++ b/slice2java/php/test/Slice/structure/Test/C.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3172281528057238516L;
+    private static final long serialVersionUID = -3172277960882999757L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/structure/Test/S1.java b/slice2java/php/test/Slice/structure/Test/S1.java
index 2182b162994f..fa9898435d1c 100644
--- a/slice2java/php/test/Slice/structure/Test/S1.java
+++ b/slice2java/php/test/Slice/structure/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = -5542857888684278405L;
+    private static final long serialVersionUID = -5542860097101541935L;
 }
diff --git a/slice2java/php/test/Slice/structure/Test/S2.java b/slice2java/php/test/Slice/structure/Test/S2.java
index 0963e677d564..a916aba1cabb 100644
--- a/slice2java/php/test/Slice/structure/Test/S2.java
+++ b/slice2java/php/test/Slice/structure/Test/S2.java
@@ -276,5 +276,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = 8506893051143832769L;
+    private static final long serialVersionUID = -881918056761407951L;
 }
diff --git a/slice2java/python/test/Glacier2/router/Test/CallbackException.java b/slice2java/python/test/Glacier2/router/Test/CallbackException.java
index ef13d380e598..8a1dfd5d13bd 100644
--- a/slice2java/python/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/python/test/Glacier2/router/Test/CallbackException.java
@@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1865376303071965874L;
+    private static final long serialVersionUID = -5087322126997343273L;
 }
diff --git a/slice2java/python/test/Ice/custom/Test/C.java b/slice2java/python/test/Ice/custom/Test/C.java
index 225dcd3a9e3f..f00cb13d460a 100644
--- a/slice2java/python/test/Ice/custom/Test/C.java
+++ b/slice2java/python/test/Ice/custom/Test/C.java
@@ -66,7 +66,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7811558344928379753L;
+    private static final long serialVersionUID = -1079511509789906729L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/custom/Test/D.java b/slice2java/python/test/Ice/custom/Test/D.java
index 7583855d3402..91cd56178333 100644
--- a/slice2java/python/test/Ice/custom/Test/D.java
+++ b/slice2java/python/test/Ice/custom/Test/D.java
@@ -546,7 +546,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1026212482445667379L;
+    private static final long serialVersionUID = -2844022877429378577L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/custom/Test/NumPy/D.java b/slice2java/python/test/Ice/custom/Test/NumPy/D.java
index 2cdfd4da5f7a..ba65c95f1207 100644
--- a/slice2java/python/test/Ice/custom/Test/NumPy/D.java
+++ b/slice2java/python/test/Ice/custom/Test/NumPy/D.java
@@ -546,7 +546,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2598105307862419947L;
+    private static final long serialVersionUID = -5073190586427595106L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/custom/Test/S.java b/slice2java/python/test/Ice/custom/Test/S.java
index e2a90b87caf9..3103e494e938 100644
--- a/slice2java/python/test/Ice/custom/Test/S.java
+++ b/slice2java/python/test/Ice/custom/Test/S.java
@@ -209,5 +209,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 8404000122696791214L;
+    private static final long serialVersionUID = 89692772864469102L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Base.java b/slice2java/python/test/Ice/defaultValue/Test/Base.java
index dd6648acf7d1..bcf40f3f8b79 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/Base.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/Base.java
@@ -106,7 +106,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4972566301852246466L;
+    private static final long serialVersionUID = 59410857642420760L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java
index 1f0b16b5ce54..7fcf722e487b 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6772647131863963766L;
+    private static final long serialVersionUID = -3309360946714903892L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 82eead220f5e..5b716a13e06e 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7425871501391333188L;
+    private static final long serialVersionUID = -2055100885665666356L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index caef2c1c50dd..346c4ca5d14d 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6137932139021686483L;
+    private static final long serialVersionUID = -3443408714403937458L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Derived.java b/slice2java/python/test/Ice/defaultValue/Test/Derived.java
index 5e3bed69ed9e..80ff6a75d4b4 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/Derived.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/Derived.java
@@ -68,7 +68,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3530109982916036813L;
+    private static final long serialVersionUID = 1040811783437726463L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java
index 9c840772c4d4..9da6ba9063f7 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java
@@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9017086024027551354L;
+    private static final long serialVersionUID = -951036667769522104L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index 202d6a8519c5..226d171f3b92 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6588935879302933400L;
+    private static final long serialVersionUID = -3046610350986662360L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index b782c9768685..171f67a1c0d5 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
@@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5324677621739887389L;
+    private static final long serialVersionUID = 6159869935602735742L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java
index 4fd797cea6a7..4ea84f72c852 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<InnerStruct> ice_read(com.zeroc.Ice.InputStream
     private static final InnerStruct _nullMarshalValue = new InnerStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 5127391951362983084L;
+    private static final long serialVersionUID = 5127387565476514480L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java
index 441ca28231ce..ce4cf13383ca 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct1> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct1 _nullMarshalValue = new Struct1();
 
     /** @hidden */
-    private static final long serialVersionUID = -5740365158746325681L;
+    private static final long serialVersionUID = -3032809163883291033L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java
index 9e55e5865331..b8528f107cbe 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java
@@ -370,5 +370,5 @@ static public java.util.Optional<Struct2> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct2 _nullMarshalValue = new Struct2();
 
     /** @hidden */
-    private static final long serialVersionUID = 3082236300524818442L;
+    private static final long serialVersionUID = -7359189410692809070L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java
index 324784a68229..3910a2eed08e 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java
@@ -274,5 +274,5 @@ static public java.util.Optional<StructNoDefaults> ice_read(com.zeroc.Ice.InputS
     private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults();
 
     /** @hidden */
-    private static final long serialVersionUID = -3178079204553188715L;
+    private static final long serialVersionUID = 898459193170021948L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/A.java b/slice2java/python/test/Ice/exceptions/Test/A.java
index 9e75155ff1bc..edfc0a90774d 100644
--- a/slice2java/python/test/Ice/exceptions/Test/A.java
+++ b/slice2java/python/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823740507632235227L;
+    private static final long serialVersionUID = 7823740522972468900L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/B.java b/slice2java/python/test/Ice/exceptions/Test/B.java
index 955dfeb2b96e..c121b426297b 100644
--- a/slice2java/python/test/Ice/exceptions/Test/B.java
+++ b/slice2java/python/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861420680737042021L;
+    private static final long serialVersionUID = -3861420830704986908L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/C.java b/slice2java/python/test/Ice/exceptions/Test/C.java
index 4351caf8f02a..96c03fb6a1a1 100644
--- a/slice2java/python/test/Ice/exceptions/Test/C.java
+++ b/slice2java/python/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080694198835020507L;
+    private static final long serialVersionUID = 1080694214175254180L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/D.java b/slice2java/python/test/Ice/exceptions/Test/D.java
index 75e9be7109b2..0c909199f9b3 100644
--- a/slice2java/python/test/Ice/exceptions/Test/D.java
+++ b/slice2java/python/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780371587365036187L;
+    private static final long serialVersionUID = 4780371437397091300L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java
index 320a29521a63..97d3c993c5ad 100644
--- a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641409090168480177L;
+    private static final long serialVersionUID = -4641409046243366352L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/A.java b/slice2java/python/test/Ice/objects/Test/A.java
index a99921719c87..9fc6e5188783 100644
--- a/slice2java/python/test/Ice/objects/Test/A.java
+++ b/slice2java/python/test/Ice/objects/Test/A.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3670712058039393005L;
+    private static final long serialVersionUID = 1878980981472836563L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/A1.java b/slice2java/python/test/Ice/objects/Test/A1.java
index 33a73e5703e0..75b5f203d9fc 100644
--- a/slice2java/python/test/Ice/objects/Test/A1.java
+++ b/slice2java/python/test/Ice/objects/Test/A1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5926743336073155992L;
+    private static final long serialVersionUID = -5926737193858537029L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/B.java b/slice2java/python/test/Ice/objects/Test/B.java
index cbf424f533bc..168f94edfc8e 100644
--- a/slice2java/python/test/Ice/objects/Test/B.java
+++ b/slice2java/python/test/Ice/objects/Test/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8890910533425703968L;
+    private static final long serialVersionUID = -8890913862792174221L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/B1.java b/slice2java/python/test/Ice/objects/Test/B1.java
index 5d999719e822..f53e7add6259 100644
--- a/slice2java/python/test/Ice/objects/Test/B1.java
+++ b/slice2java/python/test/Ice/objects/Test/B1.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4092364421679725948L;
+    private static final long serialVersionUID = 7155415761401922948L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Base.java b/slice2java/python/test/Ice/objects/Test/Base.java
index 55271e4cb930..2ea2a376815c 100644
--- a/slice2java/python/test/Ice/objects/Test/Base.java
+++ b/slice2java/python/test/Ice/objects/Test/Base.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1724297702008989404L;
+    private static final long serialVersionUID = 4347451433035778684L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/C.java b/slice2java/python/test/Ice/objects/Test/C.java
index 5c9c54c926fa..2ff9614965d0 100644
--- a/slice2java/python/test/Ice/objects/Test/C.java
+++ b/slice2java/python/test/Ice/objects/Test/C.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4055861367390439464L;
+    private static final long serialVersionUID = -4840427312046495381L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/COneMember.java b/slice2java/python/test/Ice/objects/Test/COneMember.java
index 2c8471425077..aa0f07ef3924 100644
--- a/slice2java/python/test/Ice/objects/Test/COneMember.java
+++ b/slice2java/python/test/Ice/objects/Test/COneMember.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3050969239705093948L;
+    private static final long serialVersionUID = 3050973190229503022L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java
index fd071dad644f..81cbd8415549 100644
--- a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java
+++ b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7557615171319624933L;
+    private static final long serialVersionUID = 7669950612863560731L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/D.java b/slice2java/python/test/Ice/objects/Test/D.java
index 33e5eb7cde9f..3628839cef73 100644
--- a/slice2java/python/test/Ice/objects/Test/D.java
+++ b/slice2java/python/test/Ice/objects/Test/D.java
@@ -57,7 +57,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3083376822792847383L;
+    private static final long serialVersionUID = -3304886275769207580L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/D1.java b/slice2java/python/test/Ice/objects/Test/D1.java
index bf1b4bcef2bd..8d8c048aa509 100644
--- a/slice2java/python/test/Ice/objects/Test/D1.java
+++ b/slice2java/python/test/Ice/objects/Test/D1.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1473631932373449667L;
+    private static final long serialVersionUID = 542783413022817475L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/E.java b/slice2java/python/test/Ice/objects/Test/E.java
index 602d3f9358ec..7b451005ca35 100644
--- a/slice2java/python/test/Ice/objects/Test/E.java
+++ b/slice2java/python/test/Ice/objects/Test/E.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6954259491847379716L;
+    private static final long serialVersionUID = -4122906618842277340L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/EBase.java b/slice2java/python/test/Ice/objects/Test/EBase.java
index 2910f2191d2c..37001a358f94 100644
--- a/slice2java/python/test/Ice/objects/Test/EBase.java
+++ b/slice2java/python/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5298945153407798606L;
+    private static final long serialVersionUID = -1671145838812477106L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/EDerived.java b/slice2java/python/test/Ice/objects/Test/EDerived.java
index eeb2df9af746..4e8a5a476c94 100644
--- a/slice2java/python/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/python/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5733071407119197522L;
+    private static final long serialVersionUID = -4987635058425068206L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/EOneMember.java b/slice2java/python/test/Ice/objects/Test/EOneMember.java
index b2337c3a92c4..501897573d7f 100644
--- a/slice2java/python/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/python/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225284052425497741L;
+    private static final long serialVersionUID = -6225288207153783327L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java
index 7b062e925521..6dd796032802 100644
--- a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3087003195160967788L;
+    private static final long serialVersionUID = -6584865175457977196L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/F.java b/slice2java/python/test/Ice/objects/Test/F.java
index 43f4184198a9..d8250c379652 100644
--- a/slice2java/python/test/Ice/objects/Test/F.java
+++ b/slice2java/python/test/Ice/objects/Test/F.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6156338306393225937L;
+    private static final long serialVersionUID = 4044674280554242961L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/F1.java b/slice2java/python/test/Ice/objects/Test/F1.java
index 37e8b0d7eb38..ddd7fd2a1c13 100644
--- a/slice2java/python/test/Ice/objects/Test/F1.java
+++ b/slice2java/python/test/Ice/objects/Test/F1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6192372086242052172L;
+    private static final long serialVersionUID = 6192374251954921283L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/F3.java b/slice2java/python/test/Ice/objects/Test/F3.java
index 9f248e52ffc4..0fc2da03596f 100644
--- a/slice2java/python/test/Ice/objects/Test/F3.java
+++ b/slice2java/python/test/Ice/objects/Test/F3.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3723688028102758221L;
+    private static final long serialVersionUID = -6359924076307029517L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Inner/A.java b/slice2java/python/test/Ice/objects/Test/Inner/A.java
index 4cdca2efec79..06ee99983f56 100644
--- a/slice2java/python/test/Ice/objects/Test/Inner/A.java
+++ b/slice2java/python/test/Ice/objects/Test/Inner/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1425258289869335542L;
+    private static final long serialVersionUID = -1425250864051714407L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Inner/Ex.java b/slice2java/python/test/Ice/objects/Test/Inner/Ex.java
index c4c0dfb6cb5c..3909f004b548 100644
--- a/slice2java/python/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/python/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337226532763996591L;
+    private static final long serialVersionUID = -2337227374955487102L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java
index 2d13efc0d9b0..2881e9b83bb8 100644
--- a/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java
+++ b/slice2java/python/test/Ice/objects/Test/Inner/Sub/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1298687434324386217L;
+    private static final long serialVersionUID = -1298690923950083068L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java
index ff096e0568bd..4ca3fd0f52f2 100644
--- a/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842230351958778741L;
+    private static final long serialVersionUID = 1842229504762553638L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/K.java b/slice2java/python/test/Ice/objects/Test/K.java
index 7549ee11c758..2f82e4e6d190 100644
--- a/slice2java/python/test/Ice/objects/Test/K.java
+++ b/slice2java/python/test/Ice/objects/Test/K.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4645159121760290518L;
+    private static final long serialVersionUID = 4645163894955854981L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/L.java b/slice2java/python/test/Ice/objects/Test/L.java
index 90820f73d822..cc8bd8a2c3c5 100644
--- a/slice2java/python/test/Ice/objects/Test/L.java
+++ b/slice2java/python/test/Ice/objects/Test/L.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6629747374001286499L;
+    private static final long serialVersionUID = 6629739948219443504L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/M.java b/slice2java/python/test/Ice/objects/Test/M.java
index 72a7be8793ca..cea9a2dbdc30 100644
--- a/slice2java/python/test/Ice/objects/Test/M.java
+++ b/slice2java/python/test/Ice/objects/Test/M.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8088105370540920372L;
+    private static final long serialVersionUID = -8088104683562766113L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Recursive.java b/slice2java/python/test/Ice/objects/Test/Recursive.java
index f789335a8d9a..9d328c9b665f 100644
--- a/slice2java/python/test/Ice/objects/Test/Recursive.java
+++ b/slice2java/python/test/Ice/objects/Test/Recursive.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3617885796881715292L;
+    private static final long serialVersionUID = 3617890570073659919L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/S.java b/slice2java/python/test/Ice/objects/Test/S.java
index 30fee19811d5..eafaea215a1d 100644
--- a/slice2java/python/test/Ice/objects/Test/S.java
+++ b/slice2java/python/test/Ice/objects/Test/S.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 481774523532871248L;
+    private static final long serialVersionUID = 481776489149278339L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/SOneMember.java b/slice2java/python/test/Ice/objects/Test/SOneMember.java
index 1a840b7390ea..871fa3b84d13 100644
--- a/slice2java/python/test/Ice/objects/Test/SOneMember.java
+++ b/slice2java/python/test/Ice/objects/Test/SOneMember.java
@@ -142,5 +142,5 @@ static public java.util.Optional<SOneMember> ice_read(com.zeroc.Ice.InputStream
     private static final SOneMember _nullMarshalValue = new SOneMember();
 
     /** @hidden */
-    private static final long serialVersionUID = 6227745239209711717L;
+    private static final long serialVersionUID = 6227757494025098871L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/STwoMembers.java b/slice2java/python/test/Ice/objects/Test/STwoMembers.java
index 84971d0644a0..3bee8084b032 100644
--- a/slice2java/python/test/Ice/objects/Test/STwoMembers.java
+++ b/slice2java/python/test/Ice/objects/Test/STwoMembers.java
@@ -155,5 +155,5 @@ static public java.util.Optional<STwoMembers> ice_read(com.zeroc.Ice.InputStream
     private static final STwoMembers _nullMarshalValue = new STwoMembers();
 
     /** @hidden */
-    private static final long serialVersionUID = 582631894210069250L;
+    private static final long serialVersionUID = -2081549819382998014L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/StructKey.java b/slice2java/python/test/Ice/objects/Test/StructKey.java
index ac74831ed782..8a0abbcb917f 100644
--- a/slice2java/python/test/Ice/objects/Test/StructKey.java
+++ b/slice2java/python/test/Ice/objects/Test/StructKey.java
@@ -153,5 +153,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = 3573429782197417288L;
+    private static final long serialVersionUID = 5820353585351722344L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java
index 9f00b80da428..c68edda5add6 100644
--- a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java
+++ b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<AnotherStruct> ice_read(com.zeroc.Ice.InputStre
     private static final AnotherStruct _nullMarshalValue = new AnotherStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2723849474148483348L;
+    private static final long serialVersionUID = 2723848455118378754L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/MyClass1.java b/slice2java/python/test/Ice/operations/Test/MyClass1.java
index da3651cd06a0..bb5554435905 100644
--- a/slice2java/python/test/Ice/operations/Test/MyClass1.java
+++ b/slice2java/python/test/Ice/operations/Test/MyClass1.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5943244328474055946L;
+    private static final long serialVersionUID = -2916275565218805412L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct.java b/slice2java/python/test/Ice/operations/Test/MyStruct.java
index 1eb21c7a538c..5444a87e0d64 100644
--- a/slice2java/python/test/Ice/operations/Test/MyStruct.java
+++ b/slice2java/python/test/Ice/operations/Test/MyStruct.java
@@ -148,5 +148,5 @@ static public java.util.Optional<MyStruct> ice_read(com.zeroc.Ice.InputStream is
     private static final MyStruct _nullMarshalValue = new MyStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 1986316291531864093L;
+    private static final long serialVersionUID = -4198059809735177635L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct1.java b/slice2java/python/test/Ice/operations/Test/MyStruct1.java
index 72d35db6f02f..cbd899a77630 100644
--- a/slice2java/python/test/Ice/operations/Test/MyStruct1.java
+++ b/slice2java/python/test/Ice/operations/Test/MyStruct1.java
@@ -170,5 +170,5 @@ static public java.util.Optional<MyStruct1> ice_read(com.zeroc.Ice.InputStream i
     private static final MyStruct1 _nullMarshalValue = new MyStruct1();
 
     /** @hidden */
-    private static final long serialVersionUID = 2254522151592312579L;
+    private static final long serialVersionUID = 1316030976556893141L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/Structure.java b/slice2java/python/test/Ice/operations/Test/Structure.java
index ad1020bc7a6d..a0baa8638d89 100644
--- a/slice2java/python/test/Ice/operations/Test/Structure.java
+++ b/slice2java/python/test/Ice/operations/Test/Structure.java
@@ -170,5 +170,5 @@ static public java.util.Optional<Structure> ice_read(com.zeroc.Ice.InputStream i
     private static final Structure _nullMarshalValue = new Structure();
 
     /** @hidden */
-    private static final long serialVersionUID = -4136462591260841779L;
+    private static final long serialVersionUID = -5151962333014579301L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/A.java b/slice2java/python/test/Ice/optional/Test/A.java
index 004b13074fc7..36f48f5705d4 100644
--- a/slice2java/python/test/Ice/optional/Test/A.java
+++ b/slice2java/python/test/Ice/optional/Test/A.java
@@ -212,7 +212,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 573238896692947728L;
+    private static final long serialVersionUID = 3188109496719988112L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/B.java b/slice2java/python/test/Ice/optional/Test/B.java
index 8745ca48c359..0bdf041ef5d4 100644
--- a/slice2java/python/test/Ice/optional/Test/B.java
+++ b/slice2java/python/test/Ice/optional/Test/B.java
@@ -107,7 +107,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2313881963163924771L;
+    private static final long serialVersionUID = 6027070024075016995L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/C.java b/slice2java/python/test/Ice/optional/Test/C.java
index deac51d00012..fac750b9072f 100644
--- a/slice2java/python/test/Ice/optional/Test/C.java
+++ b/slice2java/python/test/Ice/optional/Test/C.java
@@ -110,7 +110,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2691005466803063485L;
+    private static final long serialVersionUID = 2822215428779866237L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/DerivedException.java b/slice2java/python/test/Ice/optional/Test/DerivedException.java
index fd2db236235f..761fcba080ca 100644
--- a/slice2java/python/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/python/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5143979618132676816L;
+    private static final long serialVersionUID = 2093465423178911697L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/E.java b/slice2java/python/test/Ice/optional/Test/E.java
index 71cc0dfd1c33..e90392afcc88 100644
--- a/slice2java/python/test/Ice/optional/Test/E.java
+++ b/slice2java/python/test/Ice/optional/Test/E.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1850734356184103795L;
+    private static final long serialVersionUID = -1850742761121682516L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/F.java b/slice2java/python/test/Ice/optional/Test/F.java
index 29f789c0b6f9..3fbfc763e985 100644
--- a/slice2java/python/test/Ice/optional/Test/F.java
+++ b/slice2java/python/test/Ice/optional/Test/F.java
@@ -105,7 +105,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6430497613690009986L;
+    private static final long serialVersionUID = -6430489208761631137L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/FixedStruct.java b/slice2java/python/test/Ice/optional/Test/FixedStruct.java
index ac387824a1bf..73d3f2829295 100644
--- a/slice2java/python/test/Ice/optional/Test/FixedStruct.java
+++ b/slice2java/python/test/Ice/optional/Test/FixedStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<FixedStruct> ice_read(com.zeroc.Ice.InputStream
     private static final FixedStruct _nullMarshalValue = new FixedStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 1569602134525114840L;
+    private static final long serialVersionUID = 1569605009490046728L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/G.java b/slice2java/python/test/Ice/optional/Test/G.java
index fa472160ffe2..1d495e43017b 100644
--- a/slice2java/python/test/Ice/optional/Test/G.java
+++ b/slice2java/python/test/Ice/optional/Test/G.java
@@ -168,7 +168,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5343699009361284269L;
+    private static final long serialVersionUID = -3848794947921043117L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/G1.java b/slice2java/python/test/Ice/optional/Test/G1.java
index a5caa62f1f28..3b053485e2ed 100644
--- a/slice2java/python/test/Ice/optional/Test/G1.java
+++ b/slice2java/python/test/Ice/optional/Test/G1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<G1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G1 _nullMarshalValue = new G1();
 
     /** @hidden */
-    private static final long serialVersionUID = 7339784008101523710L;
+    private static final long serialVersionUID = 7339781298694369247L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/G2.java b/slice2java/python/test/Ice/optional/Test/G2.java
index ec57df2df993..fef0382a65a1 100644
--- a/slice2java/python/test/Ice/optional/Test/G2.java
+++ b/slice2java/python/test/Ice/optional/Test/G2.java
@@ -138,5 +138,5 @@ static public java.util.Optional<G2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G2 _nullMarshalValue = new G2();
 
     /** @hidden */
-    private static final long serialVersionUID = 3824556257138849634L;
+    private static final long serialVersionUID = 3824547852212774601L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/MultiOptional.java b/slice2java/python/test/Ice/optional/Test/MultiOptional.java
index c04266cfcbf3..b6fd209d016f 100644
--- a/slice2java/python/test/Ice/optional/Test/MultiOptional.java
+++ b/slice2java/python/test/Ice/optional/Test/MultiOptional.java
@@ -1675,7 +1675,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8258890040862328322L;
+    private static final long serialVersionUID = 5064310302985579731L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/OneOptional.java b/slice2java/python/test/Ice/optional/Test/OneOptional.java
index 69e3427ff6f3..630d58b72c84 100644
--- a/slice2java/python/test/Ice/optional/Test/OneOptional.java
+++ b/slice2java/python/test/Ice/optional/Test/OneOptional.java
@@ -96,7 +96,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7219598612995113866L;
+    private static final long serialVersionUID = -7219601363830666458L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/OptionalException.java b/slice2java/python/test/Ice/optional/Test/OptionalException.java
index 747858c2ead2..61759f81d5ad 100644
--- a/slice2java/python/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/python/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2678526102139843491L;
+    private static final long serialVersionUID = -1926886979297038466L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java
index 2dce10f41714..932e38608fd0 100644
--- a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java
+++ b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java
@@ -186,7 +186,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2410283280205627195L;
+    private static final long serialVersionUID = 579644743123824955L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/RequiredException.java b/slice2java/python/test/Ice/optional/Test/RequiredException.java
index 73d25819bde7..9cd8d6026d5e 100644
--- a/slice2java/python/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/python/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894238031407575159L;
+    private static final long serialVersionUID = 2894235407087738902L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/SmallStruct.java b/slice2java/python/test/Ice/optional/Test/SmallStruct.java
index 108d8787e086..36a630580291 100644
--- a/slice2java/python/test/Ice/optional/Test/SmallStruct.java
+++ b/slice2java/python/test/Ice/optional/Test/SmallStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<SmallStruct> ice_read(com.zeroc.Ice.InputStream
     private static final SmallStruct _nullMarshalValue = new SmallStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 6700988580354138190L;
+    private static final long serialVersionUID = 6700991370131304617L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/VarStruct.java b/slice2java/python/test/Ice/optional/Test/VarStruct.java
index 2696da1d8193..29c6a014ebbb 100644
--- a/slice2java/python/test/Ice/optional/Test/VarStruct.java
+++ b/slice2java/python/test/Ice/optional/Test/VarStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<VarStruct> ice_read(com.zeroc.Ice.InputStream i
     private static final VarStruct _nullMarshalValue = new VarStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -1912284859482637706L;
+    private static final long serialVersionUID = -1912287568889792169L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/WD.java b/slice2java/python/test/Ice/optional/Test/WD.java
index 0105c46cac9d..40f96d46cb91 100644
--- a/slice2java/python/test/Ice/optional/Test/WD.java
+++ b/slice2java/python/test/Ice/optional/Test/WD.java
@@ -152,7 +152,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2526892976265430968L;
+    private static final long serialVersionUID = 4019848920624995065L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/C1.java b/slice2java/python/test/Ice/packagemd/Test1/C1.java
index 1720a099b019..fd9130646be5 100644
--- a/slice2java/python/test/Ice/packagemd/Test1/C1.java
+++ b/slice2java/python/test/Ice/packagemd/Test1/C1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1894594395183029857L;
+    private static final long serialVersionUID = 1894596621691297176L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/C2.java b/slice2java/python/test/Ice/packagemd/Test1/C2.java
index 628ac4fcdaca..5f25881628c4 100644
--- a/slice2java/python/test/Ice/packagemd/Test1/C2.java
+++ b/slice2java/python/test/Ice/packagemd/Test1/C2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2892577854502044914L;
+    private static final long serialVersionUID = 2892576113616985930L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/E1.java b/slice2java/python/test/Ice/packagemd/Test1/E1.java
index ec538960dd71..36e1008c87ba 100644
--- a/slice2java/python/test/Ice/packagemd/Test1/E1.java
+++ b/slice2java/python/test/Ice/packagemd/Test1/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5787342746080507950L;
+    private static final long serialVersionUID = 5787344652275767959L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test1/E2.java b/slice2java/python/test/Ice/packagemd/Test1/E2.java
index 6b88f9e2d1bf..a947aacbb084 100644
--- a/slice2java/python/test/Ice/packagemd/Test1/E2.java
+++ b/slice2java/python/test/Ice/packagemd/Test1/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4908752446697818920L;
+    private static final long serialVersionUID = 4908749052709243024L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test1/def.java b/slice2java/python/test/Ice/packagemd/Test1/def.java
index e89e20492486..df1eaeb77279 100644
--- a/slice2java/python/test/Ice/packagemd/Test1/def.java
+++ b/slice2java/python/test/Ice/packagemd/Test1/def.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7298391327979226685L;
+    private static final long serialVersionUID = 7298388936163270596L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test2/C1.java b/slice2java/python/test/Ice/packagemd/Test2/C1.java
index f5e1fd218982..4e1a072c2c51 100644
--- a/slice2java/python/test/Ice/packagemd/Test2/C1.java
+++ b/slice2java/python/test/Ice/packagemd/Test2/C1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -860916156018318738L;
+    private static final long serialVersionUID = -860918864143200824L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test2/C2.java b/slice2java/python/test/Ice/packagemd/Test2/C2.java
index 88bc13ae99e9..2d4bed2cb189 100644
--- a/slice2java/python/test/Ice/packagemd/Test2/C2.java
+++ b/slice2java/python/test/Ice/packagemd/Test2/C2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 954152803385461208L;
+    private static final long serialVersionUID = 954149891134964760L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test2/E1.java b/slice2java/python/test/Ice/packagemd/Test2/E1.java
index ee7e94ca7fe5..44a0e74fe8e5 100644
--- a/slice2java/python/test/Ice/packagemd/Test2/E1.java
+++ b/slice2java/python/test/Ice/packagemd/Test2/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6934985692933354817L;
+    private static final long serialVersionUID = 6934988605263199975L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test2/E2.java b/slice2java/python/test/Ice/packagemd/Test2/E2.java
index 668eb3e8a771..ec80fc0f7dc2 100644
--- a/slice2java/python/test/Ice/packagemd/Test2/E2.java
+++ b/slice2java/python/test/Ice/packagemd/Test2/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5414538769882434753L;
+    private static final long serialVersionUID = 5414536061650669441L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test3/C1.java b/slice2java/python/test/Ice/packagemd/Test3/C1.java
index fc5f6a07ea73..5432fd2db0e0 100644
--- a/slice2java/python/test/Ice/packagemd/Test3/C1.java
+++ b/slice2java/python/test/Ice/packagemd/Test3/C1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5832352702901572975L;
+    private static final long serialVersionUID = 5832349829468856201L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test3/C2.java b/slice2java/python/test/Ice/packagemd/Test3/C2.java
index 14ad3a7c71a3..51fef88353d6 100644
--- a/slice2java/python/test/Ice/packagemd/Test3/C2.java
+++ b/slice2java/python/test/Ice/packagemd/Test3/C2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2769375688854758712L;
+    private static final long serialVersionUID = 2769372776608583672L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test3/E1.java b/slice2java/python/test/Ice/packagemd/Test3/E1.java
index 9f1b8db1563a..3d1db3697823 100644
--- a/slice2java/python/test/Ice/packagemd/Test3/E1.java
+++ b/slice2java/python/test/Ice/packagemd/Test3/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5344583409866667360L;
+    private static final long serialVersionUID = 5344586322196582214L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test3/E2.java b/slice2java/python/test/Ice/packagemd/Test3/E2.java
index 8cc54458a3d9..878a9fdbf6c0 100644
--- a/slice2java/python/test/Ice/packagemd/Test3/E2.java
+++ b/slice2java/python/test/Ice/packagemd/Test3/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8399048445546726304L;
+    private static final long serialVersionUID = -8399051153776261344L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/C.java b/slice2java/python/test/Ice/scope/Test/C.java
index e3541d8c1a6f..7691188a9103 100644
--- a/slice2java/python/test/Ice/scope/Test/C.java
+++ b/slice2java/python/test/Ice/scope/Test/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5190251318695649395L;
+    private static final long serialVersionUID = -5190251375527209506L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/C1.java b/slice2java/python/test/Ice/scope/Test/C1.java
index 0303ae2ff2ed..553e3bdea161 100644
--- a/slice2java/python/test/Ice/scope/Test/C1.java
+++ b/slice2java/python/test/Ice/scope/Test/C1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8893231931262342402L;
+    private static final long serialVersionUID = 8893231827939078993L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/C2.java b/slice2java/python/test/Ice/scope/Test/C2.java
index 3c01c64decad..78226785f5cd 100644
--- a/slice2java/python/test/Ice/scope/Test/C2.java
+++ b/slice2java/python/test/Ice/scope/Test/C2.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7001044685651399568L;
+    private static final long serialVersionUID = -3144797810831659517L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/Inner/C.java b/slice2java/python/test/Ice/scope/Test/Inner/C.java
index 9866f4966b53..530bca8ee5d7 100644
--- a/slice2java/python/test/Ice/scope/Test/Inner/C.java
+++ b/slice2java/python/test/Ice/scope/Test/Inner/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4615629611162991784L;
+    private static final long serialVersionUID = 4615629670496958715L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java
index 6c05bad12ad4..808d2934ee16 100644
--- a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java
+++ b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 672584709674074356L;
+    private static final long serialVersionUID = 672584603699132455L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java
index b10afe5a7d4a..b7f79ca09faf 100644
--- a/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java
+++ b/slice2java/python/test/Ice/scope/Test/Inner/Inner2/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 8654440703451611619L;
+    private static final long serialVersionUID = 8654440806762284400L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/Inner/S.java b/slice2java/python/test/Ice/scope/Test/Inner/S.java
index 65c706b52569..de2791c2ee20 100644
--- a/slice2java/python/test/Ice/scope/Test/Inner/S.java
+++ b/slice2java/python/test/Ice/scope/Test/Inner/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 3694611940136853807L;
+    private static final long serialVersionUID = 3694611878139626556L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S.java b/slice2java/python/test/Ice/scope/Test/S.java
index 77ef5c7ccd1a..fb0426d08e72 100644
--- a/slice2java/python/test/Ice/scope/Test/S.java
+++ b/slice2java/python/test/Ice/scope/Test/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 2159709507155887761L;
+    private static final long serialVersionUID = 2159709571731451010L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S1.java b/slice2java/python/test/Ice/scope/Test/S1.java
index 19ff0084152c..687823a7ddb8 100644
--- a/slice2java/python/test/Ice/scope/Test/S1.java
+++ b/slice2java/python/test/Ice/scope/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = 1241676174049837883L;
+    private static final long serialVersionUID = 1241676112212251496L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S2.java b/slice2java/python/test/Ice/scope/Test/S2.java
index 85acf5ae1601..cb152d5ac090 100644
--- a/slice2java/python/test/Ice/scope/Test/S2.java
+++ b/slice2java/python/test/Ice/scope/Test/S2.java
@@ -170,5 +170,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = 8299033675631075945L;
+    private static final long serialVersionUID = -3925383530461745798L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java
index fbafb06762ba..d8bee29487c1 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477024265663759057L;
+    private static final long serialVersionUID = -477023799366199868L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java
index e0d0fb529fb3..5ed328c57ab8 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485214290554786889L;
+    private static final long serialVersionUID = 3485214586226784866L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 06509db4f65e..6bf3bdf5f68a 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717377531242021944L;
+    private static final long serialVersionUID = 1717378077605999507L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index df8295640c31..f7b38ec4bb3d 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384918178205760223L;
+    private static final long serialVersionUID = -7384918233660102838L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index c6b844f007e6..074338596f87 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424380304735788058L;
+    private static final long serialVersionUID = 3424368135290162869L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index fb51e7886236..d353f1fa3162 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172597857184939829L;
+    private static final long serialVersionUID = -1172601722482146012L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index b6cfdf3cf6d6..5a1fea34fd01 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126109087200344654L;
+    private static final long serialVersionUID = -1126115971930583843L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index 9bb33e22ed66..6d6189825df2 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097573432681904622L;
+    private static final long serialVersionUID = -2097585602108556099L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/B.java b/slice2java/python/test/Ice/slicing/objects/Test/B.java
index 885c2e27c907..0f9b800f3b41 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/B.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/B.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8301369482093431590L;
+    private static final long serialVersionUID = -3724165173955075366L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java
index bb6a7bac92d2..6a9c59e1e071 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2611471772305176810L;
+    private static final long serialVersionUID = 1344769544995133718L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java
index a7ec00ec52ed..2b0efdb1993b 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6397005367449723901L;
+    private static final long serialVersionUID = -6397002017239636761L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java
index bb18bf8ea73f..eca9daeb7e14 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/CompactPDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9066889421796263503L;
+    private static final long serialVersionUID = -9066880436945574299L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/D1.java b/slice2java/python/test/Ice/slicing/objects/Test/D1.java
index 05ed27a8b667..426fa8e5eb82 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/D1.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/D1.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8972502425932921479L;
+    private static final long serialVersionUID = 6665984109945567353L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/D2.java b/slice2java/python/test/Ice/slicing/objects/Test/D2.java
index 883510838b56..6fec86bf3bb1 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/D2.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/D2.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2110555791468057758L;
+    private static final long serialVersionUID = -7969317609556408594L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/D3.java b/slice2java/python/test/Ice/slicing/objects/Test/D3.java
index 54360dfefacb..f131426bb8ae 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/D3.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/D3.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6867139172043378639L;
+    private static final long serialVersionUID = -6615039179622098225L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/D4.java b/slice2java/python/test/Ice/slicing/objects/Test/D4.java
index f754e31ca032..8789b2dae116 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/D4.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/D4.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5602611332499994227L;
+    private static final long serialVersionUID = -2571726682011957517L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java
index 0ede28bcbbfa..a514e8bbe790 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 329941792062202997L;
+    private static final long serialVersionUID = -1482800256353673867L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java
index 3d490a54cb0d..e75a9a009f08 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7655931348731086640L;
+    private static final long serialVersionUID = -7655923647818855164L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java
index e642e55ecb6e..328741c0a9f8 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/Hidden.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2271120676497056977L;
+    private static final long serialVersionUID = -2271128377409288453L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java b/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java
index 13c005035a92..1f414ef9ad7a 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/MyClass.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4147532663048749986L;
+    private static final long serialVersionUID = 4147528753796519555L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PBase.java b/slice2java/python/test/Ice/slicing/objects/Test/PBase.java
index 68ba905e03e2..17eaf3df515d 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/PBase.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/PBase.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 481717077864509215L;
+    private static final long serialVersionUID = 481713548364201035L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java
index 9743218569ce..f28c5d7723d8 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4426884939428413245L;
+    private static final long serialVersionUID = -4426886879070848601L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java
index 4784e3e98959..1363eda76497 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 850536324347060485L;
+    private static final long serialVersionUID = 850538759903721377L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java
index 52932e816f6c..ebe2526e1b58 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/PCDerived3.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4328902052343632612L;
+    private static final long serialVersionUID = -4328898795247327432L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java
index c020834f63b8..f01df989534b 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/PCUnknown.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5081815229419201630L;
+    private static final long serialVersionUID = -5081818734468156858L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java
index c80d67a68e0f..0e9855eee103 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/PDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 643087805366067702L;
+    private static final long serialVersionUID = 643085559611298210L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PNode.java b/slice2java/python/test/Ice/slicing/objects/Test/PNode.java
index dcae1907d69e..89e411b4a8e2 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/PNode.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/PNode.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2438004954899665993L;
+    private static final long serialVersionUID = -2438013939753872541L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java
index 9c06981cdb11..be61e5e1b28b 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4493795817748334184L;
+    private static final long serialVersionUID = 636754940503421014L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java
index a4b43c65d341..4be7c8ef3167 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/PSUnknown2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8813705592302877383L;
+    private static final long serialVersionUID = -8813709627995194512L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java
index bdbc892025c7..ab56fa3fbfa1 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/Preserved.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3651536756945757009L;
+    private static final long serialVersionUID = 3651529055831225989L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java
index 8acb3abe2ff3..0298245aa971 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/SBSKnownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8804373689020144884L;
+    private static final long serialVersionUID = 8804382673699947936L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java
index 97ddd77f8a50..0412481c4355 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/SBSUnknownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4989065594423980975L;
+    private static final long serialVersionUID = -4989067140230307297L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SBase.java b/slice2java/python/test/Ice/slicing/objects/Test/SBase.java
index 6e7f6e74bb76..4efce20fc000 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/SBase.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/SBase.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5353758475520449022L;
+    private static final long serialVersionUID = -5353762005030351146L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SS1.java b/slice2java/python/test/Ice/slicing/objects/Test/SS1.java
index e4ecdf6dd447..79c3d6393628 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/SS1.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/SS1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6522143175480025532L;
+    private static final long serialVersionUID = -6522139645961030128L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SS2.java b/slice2java/python/test/Ice/slicing/objects/Test/SS2.java
index f2f8ba5caa66..350f8f74495a 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/SS2.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/SS2.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7620284661355841735L;
+    private static final long serialVersionUID = 7620288190874837139L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SS3.java b/slice2java/python/test/Ice/slicing/objects/Test/SS3.java
index 97eabd05c6e6..0c7dae9031d2 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/SS3.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/SS3.java
@@ -155,5 +155,5 @@ static public java.util.Optional<SS3> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final SS3 _nullMarshalValue = new SS3();
 
     /** @hidden */
-    private static final long serialVersionUID = -9201462895751455980L;
+    private static final long serialVersionUID = 7055504206986714004L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java
index 458fb6bba277..e5c4736ea870 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4063223364089121921L;
+    private static final long serialVersionUID = -6000636159149396448L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java b/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java
index ac1809a3a6a5..45129f3d335b 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4487258415950629942L;
+    private static final long serialVersionUID = -8654736608491259198L;
 }
diff --git a/slice2java/python/test/Slice/escape/Clash/Cls.java b/slice2java/python/test/Slice/escape/Clash/Cls.java
index 19dda5eedb31..325808367472 100644
--- a/slice2java/python/test/Slice/escape/Clash/Cls.java
+++ b/slice2java/python/test/Slice/escape/Clash/Cls.java
@@ -164,7 +164,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4086539454192982736L;
+    private static final long serialVersionUID = -2229971207526455394L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/escape/Clash/Ex.java b/slice2java/python/test/Slice/escape/Clash/Ex.java
index 758531e8fc09..461f2bbd6b7e 100644
--- a/slice2java/python/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/python/test/Slice/escape/Clash/Ex.java
@@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3705431062460660311L;
+    private static final long serialVersionUID = 7844961318238650979L;
 }
diff --git a/slice2java/python/test/Slice/escape/Clash/St.java b/slice2java/python/test/Slice/escape/Clash/St.java
index 495069295a0a..d2a179106672 100644
--- a/slice2java/python/test/Slice/escape/Clash/St.java
+++ b/slice2java/python/test/Slice/escape/Clash/St.java
@@ -187,5 +187,5 @@ static public java.util.Optional<St> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final St _nullMarshalValue = new St();
 
     /** @hidden */
-    private static final long serialVersionUID = -6588350293136406158L;
+    private static final long serialVersionUID = -2999000834449818100L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/_continue.java b/slice2java/python/test/Slice/escape/and/_continue.java
index 72cb59ce79eb..f8ece70cdf7e 100644
--- a/slice2java/python/test/Slice/escape/and/_continue.java
+++ b/slice2java/python/test/Slice/escape/and/_continue.java
@@ -138,5 +138,5 @@ static public java.util.Optional<_continue> ice_read(com.zeroc.Ice.InputStream i
     private static final _continue _nullMarshalValue = new _continue();
 
     /** @hidden */
-    private static final long serialVersionUID = 1201373782562334927L;
+    private static final long serialVersionUID = 1201370339514407674L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/_for.java b/slice2java/python/test/Slice/escape/and/_for.java
index fa311a9b05b2..d25d6ccfb93f 100644
--- a/slice2java/python/test/Slice/escape/and/_for.java
+++ b/slice2java/python/test/Slice/escape/and/_for.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2702317951788739838L;
+    private static final long serialVersionUID = 4244562093150668259L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/escape/and/is.java b/slice2java/python/test/Slice/escape/and/is.java
index 5f88cef9f98d..577cef930645 100644
--- a/slice2java/python/test/Slice/escape/and/is.java
+++ b/slice2java/python/test/Slice/escape/and/is.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4585938535296334028L;
+    private static final long serialVersionUID = -4585934766655449343L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/not.java b/slice2java/python/test/Slice/escape/and/not.java
index e5515684dca3..113885ce8226 100644
--- a/slice2java/python/test/Slice/escape/and/not.java
+++ b/slice2java/python/test/Slice/escape/and/not.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2236348987128870535L;
+    private static final long serialVersionUID = 7250241105198139769L;
 }
diff --git a/slice2java/python/test/Slice/macros/Test/Default.java b/slice2java/python/test/Slice/macros/Test/Default.java
index bc844d265b7e..4bcf8681015e 100644
--- a/slice2java/python/test/Slice/macros/Test/Default.java
+++ b/slice2java/python/test/Slice/macros/Test/Default.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5965880125158262914L;
+    private static final long serialVersionUID = 2969067097710073950L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/macros/Test/NoDefault.java b/slice2java/python/test/Slice/macros/Test/NoDefault.java
index 5631c871ff34..4a43c6ec6473 100644
--- a/slice2java/python/test/Slice/macros/Test/NoDefault.java
+++ b/slice2java/python/test/Slice/macros/Test/NoDefault.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5373754086181738527L;
+    private static final long serialVersionUID = 2339681238940879423L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/structure/Test/C.java b/slice2java/python/test/Slice/structure/Test/C.java
index a84183531516..2bf81f3f28fd 100644
--- a/slice2java/python/test/Slice/structure/Test/C.java
+++ b/slice2java/python/test/Slice/structure/Test/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1667152043776994280L;
+    private static final long serialVersionUID = 1667154252203375438L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/structure/Test/S1.java b/slice2java/python/test/Slice/structure/Test/S1.java
index 8f3743c1b093..998f54844efb 100644
--- a/slice2java/python/test/Slice/structure/Test/S1.java
+++ b/slice2java/python/test/Slice/structure/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = -5542866151496615872L;
+    private static final long serialVersionUID = -5542863942936840922L;
 }
diff --git a/slice2java/python/test/Slice/structure/Test/S2.java b/slice2java/python/test/Slice/structure/Test/S2.java
index 89ad210c3bf9..084c67e0a55d 100644
--- a/slice2java/python/test/Slice/structure/Test/S2.java
+++ b/slice2java/python/test/Slice/structure/Test/S2.java
@@ -217,5 +217,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = 683158132761998228L;
+    private static final long serialVersionUID = 8474023603120833473L;
 }
diff --git a/slice2java/python/test/Slice/structure/Test/S3.java b/slice2java/python/test/Slice/structure/Test/S3.java
index 118f3b1cceb0..94baefafeb28 100644
--- a/slice2java/python/test/Slice/structure/Test/S3.java
+++ b/slice2java/python/test/Slice/structure/Test/S3.java
@@ -168,5 +168,5 @@ static public java.util.Optional<S3> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S3 _nullMarshalValue = new S3();
 
     /** @hidden */
-    private static final long serialVersionUID = -1827341180871471062L;
+    private static final long serialVersionUID = -2488679000088685931L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java
index f37dcde994d7..cf60c19ebb0a 100644
--- a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java
+++ b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java
@@ -106,7 +106,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8966154991086772862L;
+    private static final long serialVersionUID = -4954363836015023064L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 59942f48865e..ba1d30c62425 100644
--- a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java
+++ b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8462165835687778042L;
+    private static final long serialVersionUID = -7362622839112517429L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index fcda8bc3b7c9..5f71834e6f20 100644
--- a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
+++ b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9102350519132624922L;
+    private static final long serialVersionUID = -3668256180455885712L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java
index c2911910ae3f..8640af40f984 100644
--- a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java
+++ b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java
@@ -68,7 +68,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5421301748324659699L;
+    private static final long serialVersionUID = -1958012431843505674L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java
index 28f308313328..42bceb408e51 100644
--- a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java
+++ b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<InnerStruct> ice_read(com.zeroc.Ice.InputStream
     private static final InnerStruct _nullMarshalValue = new InnerStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 5127393409502530128L;
+    private static final long serialVersionUID = 5127391987467813358L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java
index 38d633fea431..f9d5a309516f 100644
--- a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java
+++ b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct1> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct1 _nullMarshalValue = new Struct1();
 
     /** @hidden */
-    private static final long serialVersionUID = 1566854975426193103L;
+    private static final long serialVersionUID = -5770913473797191938L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java
index 06aa0b9f10e6..3023564deb1f 100644
--- a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java
+++ b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java
@@ -370,5 +370,5 @@ static public java.util.Optional<Struct2> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct2 _nullMarshalValue = new Struct2();
 
     /** @hidden */
-    private static final long serialVersionUID = -778644716032971254L;
+    private static final long serialVersionUID = -3308284805421709238L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java
index cbc507843ff2..32dba5d26154 100644
--- a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java
+++ b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java
@@ -274,5 +274,5 @@ static public java.util.Optional<StructNoDefaults> ice_read(com.zeroc.Ice.InputS
     private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults();
 
     /** @hidden */
-    private static final long serialVersionUID = -328489856421023013L;
+    private static final long serialVersionUID = -1904272966572255778L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/A.java b/slice2java/ruby/test/Ice/exceptions/Test/A.java
index da58b2358a98..dee28aedad01 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/A.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823738483825997604L;
+    private static final long serialVersionUID = 7823744729356039618L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/B.java b/slice2java/ruby/test/Ice/exceptions/Test/B.java
index 5e7224f8b878..46924df06b7f 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/B.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861417414690617756L;
+    private static final long serialVersionUID = -3861405879298575102L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/C.java b/slice2java/ruby/test/Ice/exceptions/Test/C.java
index 897d4516d4a8..f609ae24d311 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/C.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080692175028782884L;
+    private static final long serialVersionUID = 1080698420558824898L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/D.java b/slice2java/ruby/test/Ice/exceptions/Test/D.java
index 1b679f59e0ca..8522c1793d87 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/D.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780374853411460452L;
+    private static final long serialVersionUID = 4780386388803503106L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java
index da2be136622b..141fae9f7dfc 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641409791511476048L;
+    private static final long serialVersionUID = -4641415458463580330L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/A.java b/slice2java/ruby/test/Ice/objects/Test/A.java
index 7ad0cdd39fa9..67a4626923b2 100644
--- a/slice2java/ruby/test/Ice/objects/Test/A.java
+++ b/slice2java/ruby/test/Ice/objects/Test/A.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5820204761329599971L;
+    private static final long serialVersionUID = -3443528759865983275L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/A1.java b/slice2java/ruby/test/Ice/objects/Test/A1.java
index f70969e05e44..fbe0d688b681 100644
--- a/slice2java/ruby/test/Ice/objects/Test/A1.java
+++ b/slice2java/ruby/test/Ice/objects/Test/A1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5926743073834073417L;
+    private static final long serialVersionUID = -5926746603643518643L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/B.java b/slice2java/ruby/test/Ice/objects/Test/B.java
index 80a25f9723a5..ee0a7d354ae9 100644
--- a/slice2java/ruby/test/Ice/objects/Test/B.java
+++ b/slice2java/ruby/test/Ice/objects/Test/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8890910475286146405L;
+    private static final long serialVersionUID = -8890912152769996601L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/B1.java b/slice2java/ruby/test/Ice/objects/Test/B1.java
index 11a75bcb3b4b..a9b5d7fc4b31 100644
--- a/slice2java/ruby/test/Ice/objects/Test/B1.java
+++ b/slice2java/ruby/test/Ice/objects/Test/B1.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9095994696791004668L;
+    private static final long serialVersionUID = 5687607061450346500L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/Base.java b/slice2java/ruby/test/Ice/objects/Test/Base.java
index fc069758ebfa..449fda1af3d9 100644
--- a/slice2java/ruby/test/Ice/objects/Test/Base.java
+++ b/slice2java/ruby/test/Ice/objects/Test/Base.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3497250184336217528L;
+    private static final long serialVersionUID = 6040191515483577342L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/C.java b/slice2java/ruby/test/Ice/objects/Test/C.java
index 9f19c83f8c36..4c358f7dd801 100644
--- a/slice2java/ruby/test/Ice/objects/Test/C.java
+++ b/slice2java/ruby/test/Ice/objects/Test/C.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2849565402433308066L;
+    private static final long serialVersionUID = 5055631186701452061L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/COneMember.java b/slice2java/ruby/test/Ice/objects/Test/COneMember.java
index 1301cb4b3200..62fb96f030ba 100644
--- a/slice2java/ruby/test/Ice/objects/Test/COneMember.java
+++ b/slice2java/ruby/test/Ice/objects/Test/COneMember.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3050968983835560776L;
+    private static final long serialVersionUID = 3050965690737031667L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java
index a8e55ace6128..0b832b03f2e5 100644
--- a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java
+++ b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3854157394236444389L;
+    private static final long serialVersionUID = -6993075003575240037L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/D.java b/slice2java/ruby/test/Ice/objects/Test/D.java
index 67d980e03e18..5aa42c577c2b 100644
--- a/slice2java/ruby/test/Ice/objects/Test/D.java
+++ b/slice2java/ruby/test/Ice/objects/Test/D.java
@@ -57,7 +57,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8829057451813306942L;
+    private static final long serialVersionUID = 4067933240465073110L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/D1.java b/slice2java/ruby/test/Ice/objects/Test/D1.java
index debb21a0c43e..2ecc34062441 100644
--- a/slice2java/ruby/test/Ice/objects/Test/D1.java
+++ b/slice2java/ruby/test/Ice/objects/Test/D1.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8269793568455533891L;
+    private static final long serialVersionUID = -6781691260003949757L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/E.java b/slice2java/ruby/test/Ice/objects/Test/E.java
index a856079cc705..8e3ce9edf09e 100644
--- a/slice2java/ruby/test/Ice/objects/Test/E.java
+++ b/slice2java/ruby/test/Ice/objects/Test/E.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5894222885276475288L;
+    private static final long serialVersionUID = 7601802144662620770L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/EBase.java b/slice2java/ruby/test/Ice/objects/Test/EBase.java
index f2b1a51cdc25..f4958ce8d4c4 100644
--- a/slice2java/ruby/test/Ice/objects/Test/EBase.java
+++ b/slice2java/ruby/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9109701019961044274L;
+    private static final long serialVersionUID = -7611083735188941874L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/EDerived.java b/slice2java/ruby/test/Ice/objects/Test/EDerived.java
index 85d1f6dacd36..6f9cbbeb74eb 100644
--- a/slice2java/ruby/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/ruby/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6636247974398221778L;
+    private static final long serialVersionUID = 7673310833609800530L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java
index 238f16994e0c..262fbeb88c11 100644
--- a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225284000759701561L;
+    private static final long serialVersionUID = -6225287446389236804L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java
index 3307d656e4b3..cf28f4d6710b 100644
--- a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3079573494412158868L;
+    private static final long serialVersionUID = -7960669407385865964L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/F.java b/slice2java/ruby/test/Ice/objects/Test/F.java
index 30ad075391db..d64b6e704891 100644
--- a/slice2java/ruby/test/Ice/objects/Test/F.java
+++ b/slice2java/ruby/test/Ice/objects/Test/F.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6126884805288675887L;
+    private static final long serialVersionUID = 625616354355539665L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/F1.java b/slice2java/ruby/test/Ice/objects/Test/F1.java
index 340763beb6e7..f446ee03871f 100644
--- a/slice2java/ruby/test/Ice/objects/Test/F1.java
+++ b/slice2java/ruby/test/Ice/objects/Test/F1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6192373425418628160L;
+    private static final long serialVersionUID = 6192365827638609156L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/F3.java b/slice2java/ruby/test/Ice/objects/Test/F3.java
index 255b53b688ce..9221d25341a2 100644
--- a/slice2java/ruby/test/Ice/objects/Test/F3.java
+++ b/slice2java/ruby/test/Ice/objects/Test/F3.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1100249882306062525L;
+    private static final long serialVersionUID = -2979329305644163197L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/K.java b/slice2java/ruby/test/Ice/objects/Test/K.java
index 17e0191e60e3..97cb74effdad 100644
--- a/slice2java/ruby/test/Ice/objects/Test/K.java
+++ b/slice2java/ruby/test/Ice/objects/Test/K.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4645159024719656119L;
+    private static final long serialVersionUID = 4645162559489876023L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/L.java b/slice2java/ruby/test/Ice/objects/Test/L.java
index 26b479498fab..10fb9225fc54 100644
--- a/slice2java/ruby/test/Ice/objects/Test/L.java
+++ b/slice2java/ruby/test/Ice/objects/Test/L.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6629747470951436348L;
+    private static final long serialVersionUID = 6629749639240846598L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/M.java b/slice2java/ruby/test/Ice/objects/Test/M.java
index 08e8e2e3a366..05e9c34c1fb0 100644
--- a/slice2java/ruby/test/Ice/objects/Test/M.java
+++ b/slice2java/ruby/test/Ice/objects/Test/M.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8088105593892989768L;
+    private static final long serialVersionUID = -8088103668397902727L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/Recursive.java b/slice2java/ruby/test/Ice/objects/Test/Recursive.java
index 96b28587e91d..00354c9aef44 100644
--- a/slice2java/ruby/test/Ice/objects/Test/Recursive.java
+++ b/slice2java/ruby/test/Ice/objects/Test/Recursive.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3617886020143394217L;
+    private static final long serialVersionUID = 3617889554903624210L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/S.java b/slice2java/ruby/test/Ice/objects/Test/S.java
index 13a87686feb7..443adf526759 100644
--- a/slice2java/ruby/test/Ice/objects/Test/S.java
+++ b/slice2java/ruby/test/Ice/objects/Test/S.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 481774581587046799L;
+    private static final long serialVersionUID = 481778194041237941L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java
index 285475cb67f9..d97e0c9e3e95 100644
--- a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java
+++ b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java
@@ -142,5 +142,5 @@ static public java.util.Optional<SOneMember> ice_read(com.zeroc.Ice.InputStream
     private static final SOneMember _nullMarshalValue = new SOneMember();
 
     /** @hidden */
-    private static final long serialVersionUID = 6227745014653156177L;
+    private static final long serialVersionUID = 6227748467884522154L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java
index 04434433be25..c05ff73189d1 100644
--- a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java
+++ b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java
@@ -155,5 +155,5 @@ static public java.util.Optional<STwoMembers> ice_read(com.zeroc.Ice.InputStream
     private static final STwoMembers _nullMarshalValue = new STwoMembers();
 
     /** @hidden */
-    private static final long serialVersionUID = -524202844869811710L;
+    private static final long serialVersionUID = -8769826484108503678L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/StructKey.java b/slice2java/ruby/test/Ice/objects/Test/StructKey.java
index 83123ef1a45c..0d8bd6efefb9 100644
--- a/slice2java/ruby/test/Ice/objects/Test/StructKey.java
+++ b/slice2java/ruby/test/Ice/objects/Test/StructKey.java
@@ -153,5 +153,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = -1852275389216955308L;
+    private static final long serialVersionUID = -4348490729579446098L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java
index 22878260bb98..f819e4a8ce1f 100644
--- a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java
+++ b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<AnotherStruct> ice_read(com.zeroc.Ice.InputStre
     private static final AnotherStruct _nullMarshalValue = new AnotherStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2723848559807458091L;
+    private static final long serialVersionUID = 2723850361332536253L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java
index 91722a263a6c..c626c3faab4e 100644
--- a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java
+++ b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5992864374307810259L;
+    private static final long serialVersionUID = -59922233229239931L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java
index 739595a4c6a1..ac992cd17fdc 100644
--- a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java
+++ b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java
@@ -148,5 +148,5 @@ static public java.util.Optional<MyStruct> ice_read(com.zeroc.Ice.InputStream is
     private static final MyStruct _nullMarshalValue = new MyStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2477752257485697853L;
+    private static final long serialVersionUID = -9177641302014690435L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java
index 32a358e6ed2a..0965bf3998a3 100644
--- a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java
+++ b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java
@@ -170,5 +170,5 @@ static public java.util.Optional<MyStruct1> ice_read(com.zeroc.Ice.InputStream i
     private static final MyStruct1 _nullMarshalValue = new MyStruct1();
 
     /** @hidden */
-    private static final long serialVersionUID = 478460291423911706L;
+    private static final long serialVersionUID = -8242389405782853044L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/Structure.java b/slice2java/ruby/test/Ice/operations/Test/Structure.java
index 51a81363610b..0f6a448b581a 100644
--- a/slice2java/ruby/test/Ice/operations/Test/Structure.java
+++ b/slice2java/ruby/test/Ice/operations/Test/Structure.java
@@ -170,5 +170,5 @@ static public java.util.Optional<Structure> ice_read(com.zeroc.Ice.InputStream i
     private static final Structure _nullMarshalValue = new Structure();
 
     /** @hidden */
-    private static final long serialVersionUID = -4713665429973265460L;
+    private static final long serialVersionUID = 6445824715346704538L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/A.java b/slice2java/ruby/test/Ice/optional/Test/A.java
index 7ba52b857591..2b1253389275 100644
--- a/slice2java/ruby/test/Ice/optional/Test/A.java
+++ b/slice2java/ruby/test/Ice/optional/Test/A.java
@@ -212,7 +212,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5961635278061953936L;
+    private static final long serialVersionUID = -7501403099666998768L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/B.java b/slice2java/ruby/test/Ice/optional/Test/B.java
index a8a72a00cf60..b38ed3896947 100644
--- a/slice2java/ruby/test/Ice/optional/Test/B.java
+++ b/slice2java/ruby/test/Ice/optional/Test/B.java
@@ -107,7 +107,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1629123945509686173L;
+    private static final long serialVersionUID = 7894405338895923683L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/C.java b/slice2java/ruby/test/Ice/optional/Test/C.java
index 5213fe95a506..d5520cfb79da 100644
--- a/slice2java/ruby/test/Ice/optional/Test/C.java
+++ b/slice2java/ruby/test/Ice/optional/Test/C.java
@@ -110,7 +110,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4762219490123606787L;
+    private static final long serialVersionUID = 532364623649878909L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java
index dc651a1f8e7a..61b97e6f7abb 100644
--- a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3093600510282343001L;
+    private static final long serialVersionUID = 6699342600662508257L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/E.java b/slice2java/ruby/test/Ice/optional/Test/E.java
index cc96932750ab..42bc6882484e 100644
--- a/slice2java/ruby/test/Ice/optional/Test/E.java
+++ b/slice2java/ruby/test/Ice/optional/Test/E.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1850740626446968618L;
+    private static final long serialVersionUID = -1850739169562273774L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/F.java b/slice2java/ruby/test/Ice/optional/Test/F.java
index 576bf9271155..55f1be185411 100644
--- a/slice2java/ruby/test/Ice/optional/Test/F.java
+++ b/slice2java/ruby/test/Ice/optional/Test/F.java
@@ -105,7 +105,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6430497113880992859L;
+    private static final long serialVersionUID = -6430492800311843487L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java
index 76335655d117..8339b8873e38 100644
--- a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java
+++ b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<FixedStruct> ice_read(com.zeroc.Ice.InputStream
     private static final FixedStruct _nullMarshalValue = new FixedStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 1569605447225971685L;
+    private static final long serialVersionUID = 1569601492742582089L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/G.java b/slice2java/ruby/test/Ice/optional/Test/G.java
index c0a43dc6d7a4..feb5e1c25e99 100644
--- a/slice2java/ruby/test/Ice/optional/Test/G.java
+++ b/slice2java/ruby/test/Ice/optional/Test/G.java
@@ -168,7 +168,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4985108790157132909L;
+    private static final long serialVersionUID = -615492846537295405L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/G1.java b/slice2java/ruby/test/Ice/optional/Test/G1.java
index 3f3cef5d2037..97e09f348071 100644
--- a/slice2java/ruby/test/Ice/optional/Test/G1.java
+++ b/slice2java/ruby/test/Ice/optional/Test/G1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<G1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G1 _nullMarshalValue = new G1();
 
     /** @hidden */
-    private static final long serialVersionUID = 7339780540339185449L;
+    private static final long serialVersionUID = 7339784649885136623L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/G2.java b/slice2java/ruby/test/Ice/optional/Test/G2.java
index 0a99c6903d6a..1ec27b0e3f57 100644
--- a/slice2java/ruby/test/Ice/optional/Test/G2.java
+++ b/slice2java/ruby/test/Ice/optional/Test/G2.java
@@ -138,5 +138,5 @@ static public java.util.Optional<G2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G2 _nullMarshalValue = new G2();
 
     /** @hidden */
-    private static final long serialVersionUID = 3824549986896292425L;
+    private static final long serialVersionUID = 3824551443761792113L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java
index 1bb3326a2ff3..343e31aecbeb 100644
--- a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java
+++ b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java
@@ -1675,7 +1675,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3593053242843791254L;
+    private static final long serialVersionUID = 1335146210687123L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java
index b867d0bb8bef..53b76d0d00fb 100644
--- a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java
+++ b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java
@@ -96,7 +96,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7219600600653426293L;
+    private static final long serialVersionUID = -7219599254777642393L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java
index 57fc28555957..09a7d22d7e5f 100644
--- a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6273322804550426105L;
+    private static final long serialVersionUID = -6444067575104780456L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java
index 8650aea58789..872804eac1a7 100644
--- a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java
+++ b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java
@@ -186,7 +186,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6567041131197856965L;
+    private static final long serialVersionUID = 9183519065059256635L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java
index 4a096c257a72..2ee9e25a9f35 100644
--- a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894242661303570208L;
+    private static final long serialVersionUID = 2894238673191186022L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java
index 8d54b3defab3..a747361485bc 100644
--- a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java
+++ b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<SmallStruct> ice_read(com.zeroc.Ice.InputStream
     private static final SmallStruct _nullMarshalValue = new SmallStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 6700983795323212699L;
+    private static final long serialVersionUID = 6700987938570523103L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java
index bbb8b1f3a313..8d019aae9d07 100644
--- a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java
+++ b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<VarStruct> ice_read(com.zeroc.Ice.InputStream i
     private static final VarStruct _nullMarshalValue = new VarStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -1912288327244975967L;
+    private static final long serialVersionUID = -1912284217699024793L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/WD.java b/slice2java/ruby/test/Ice/optional/Test/WD.java
index 3bba3fe63610..dd41c708f631 100644
--- a/slice2java/ruby/test/Ice/optional/Test/WD.java
+++ b/slice2java/ruby/test/Ice/optional/Test/WD.java
@@ -152,7 +152,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 674247569610550658L;
+    private static final long serialVersionUID = 5885824849732408616L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C.java b/slice2java/ruby/test/Ice/scope/Test/C.java
index 6212a49e609f..05dcb449b380 100644
--- a/slice2java/ruby/test/Ice/scope/Test/C.java
+++ b/slice2java/ruby/test/Ice/scope/Test/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5190247827786625562L;
+    private static final long serialVersionUID = -5190250069928432246L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C1.java b/slice2java/ruby/test/Ice/scope/Test/C1.java
index cadd5af88adf..92386d421702 100644
--- a/slice2java/ruby/test/Ice/scope/Test/C1.java
+++ b/slice2java/ruby/test/Ice/scope/Test/C1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8893228440337208679L;
+    private static final long serialVersionUID = 8893230362204453963L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C2.java b/slice2java/ruby/test/Ice/scope/Test/C2.java
index 08523590b609..be73259f47e6 100644
--- a/slice2java/ruby/test/Ice/scope/Test/C2.java
+++ b/slice2java/ruby/test/Ice/scope/Test/C2.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2373352696676571866L;
+    private static final long serialVersionUID = -109995284690726491L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/C.java b/slice2java/ruby/test/Ice/scope/Test/Inner/C.java
index 6489b8caa2dd..9081ef19c153 100644
--- a/slice2java/ruby/test/Ice/scope/Test/Inner/C.java
+++ b/slice2java/ruby/test/Ice/scope/Test/Inner/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4615623475297723585L;
+    private static final long serialVersionUID = 4615625719967999678L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java
index c8258c87d294..87ea400cdd69 100644
--- a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java
+++ b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 672584028827983141L;
+    private static final long serialVersionUID = 672580498199449318L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java
index 8114271576cd..304e1ab7cecb 100644
--- a/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java
+++ b/slice2java/ruby/test/Ice/scope/Test/Inner/Inner2/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 8654444194370384248L;
+    private static final long serialVersionUID = 8654442272502446224L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java
index 06b9c0795d0f..964a63909da3 100644
--- a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java
+++ b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 3694609975885151540L;
+    private static final long serialVersionUID = 3694613188903484252L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S.java b/slice2java/ruby/test/Ice/scope/Test/S.java
index dc4f4f12e34b..7d4e15a7fb5d 100644
--- a/slice2java/ruby/test/Ice/scope/Test/S.java
+++ b/slice2java/ruby/test/Ice/scope/Test/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 2159708826481191690L;
+    private static final long serialVersionUID = 2159705616041123234L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S1.java b/slice2java/ruby/test/Ice/scope/Test/S1.java
index e568318997b6..19003a5e8396 100644
--- a/slice2java/ruby/test/Ice/scope/Test/S1.java
+++ b/slice2java/ruby/test/Ice/scope/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = 1241668754658160990L;
+    private static final long serialVersionUID = 1241671962653068402L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S2.java b/slice2java/ruby/test/Ice/scope/Test/S2.java
index d3e0ddaa12fa..00fedbae801f 100644
--- a/slice2java/ruby/test/Ice/scope/Test/S2.java
+++ b/slice2java/ruby/test/Ice/scope/Test/S2.java
@@ -170,5 +170,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = -5442092835646815649L;
+    private static final long serialVersionUID = -6218149568088287524L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java
index 885d36981d5f..597594336d99 100644
--- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477022830914612013L;
+    private static final long serialVersionUID = -477021959261244009L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 1199c8ed6cd8..bba47a44b951 100644
--- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485209614067877621L;
+    private static final long serialVersionUID = 3485211302090574769L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index edf1634c7ae0..f5298824f429 100644
--- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717377109154411652L;
+    private static final long serialVersionUID = 1717375906715045952L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index ad75142e27e0..27adbc808c77 100644
--- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384912290492881827L;
+    private static final long serialVersionUID = -7384921843540784999L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java
index e5e2fb541ee8..b76fd5115dae 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7777928601309567706L;
+    private static final long serialVersionUID = 2818826148974607258L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java
index 60555c2c302e..b2e9cd925d0f 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7268353357129829142L;
+    private static final long serialVersionUID = 1765093271674016214L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java
index bc243e10352a..6399dd8a427d 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6396993609888647190L;
+    private static final long serialVersionUID = -6396997346117608283L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java
index 484083b137d7..63d6f690c256 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9066889544407449646L;
+    private static final long serialVersionUID = -9066889282274021146L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java b/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java
index 8080dd0f9981..d3aab282c0fe 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/D1.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6219834674398832985L;
+    private static final long serialVersionUID = -1753993253887993703L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java b/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java
index a605c5c4734a..8d4f5bc62dad 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/D3.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2314425828956852977L;
+    private static final long serialVersionUID = 3897369503010287555L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java
index 783025165d10..e5ae98eede53 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1173978978152175573L;
+    private static final long serialVersionUID = -3537928325480678507L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java
index 049369cc53af..ec2460b445a0 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7655931386489087392L;
+    private static final long serialVersionUID = -7655931168039611052L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java
index 35a79083809d..624793c67750 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Hidden.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2271120473658105972L;
+    private static final long serialVersionUID = -2271120692113264584L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java
index 19d18147a02f..f13a258e2559 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PBase.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 481717280705481404L;
+    private static final long serialVersionUID = 481716935808786888L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java
index 3f389d443ea6..3316b47c9440 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4426878637027898454L;
+    private static final long serialVersionUID = -4426887828265762459L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java
index 57d13e479f2c..1d8ab0ef0732 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 850535802561883251L;
+    private static final long serialVersionUID = 850544668354254004L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java
index f22aa2d64544..24b2674b499c 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCDerived3.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4328907071107753548L;
+    private static final long serialVersionUID = -4328899168560260078L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java
index 5ed9285b0ef0..d6a075014f20 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PCUnknown.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5081810295857370718L;
+    private static final long serialVersionUID = -5081818115923698564L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java
index 5ffac657ae82..b0a947eabfe9 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 643087762669493333L;
+    private static final long serialVersionUID = 643087792329347873L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java b/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java
index 455a5318ff1a..48afb88dadef 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/PNode.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2438004992435179564L;
+    private static final long serialVersionUID = -2438005259572399840L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java
index c0ddd6638857..cec3b3e06452 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/Preserved.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3651536959784363890L;
+    private static final long serialVersionUID = 3651536741278847366L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java
index 4db2dec229b1..67b939231d95 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SBSKnownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8804373646323574871L;
+    private static final long serialVersionUID = 8804373996239197859L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java
index 8ebe7cb11a22..7a8c934d2ddf 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SBase.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5353758512899636639L;
+    private static final long serialVersionUID = -5353758614848670379L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java
index 0ee0a4d41aa6..3e9b036494ec 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6522143298247681625L;
+    private static final long serialVersionUID = -6522143201298610221L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java
index 6facf14583a0..37ff2b890171 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS2.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7620284618663660388L;
+    private static final long serialVersionUID = 7620284803271416272L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java b/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java
index 6acc9bd84f25..a1de3a898d5d 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/SS3.java
@@ -155,5 +155,5 @@ static public java.util.Optional<SS3> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final SS3 _nullMarshalValue = new SS3();
 
     /** @hidden */
-    private static final long serialVersionUID = 5831537472749568788L;
+    private static final long serialVersionUID = 5742767621414792916L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/and.java b/slice2java/ruby/test/Slice/escape/BEGIN/and.java
index d02623cda5a3..bf669376389f 100644
--- a/slice2java/ruby/test/Slice/escape/BEGIN/and.java
+++ b/slice2java/ruby/test/Slice/escape/BEGIN/and.java
@@ -138,5 +138,5 @@ static public java.util.Optional<and> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final and _nullMarshalValue = new and();
 
     /** @hidden */
-    private static final long serialVersionUID = 1440097327194259825L;
+    private static final long serialVersionUID = 1440097328568672120L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/display.java b/slice2java/ruby/test/Slice/escape/BEGIN/display.java
index 0f4b6e5f4c3f..f8c92a9b6f97 100644
--- a/slice2java/ruby/test/Slice/escape/BEGIN/display.java
+++ b/slice2java/ruby/test/Slice/escape/BEGIN/display.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5239535165059762301L;
+    private static final long serialVersionUID = 550310586724829683L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/next.java b/slice2java/ruby/test/Slice/escape/BEGIN/next.java
index 8611faf78670..120396649c0b 100644
--- a/slice2java/ruby/test/Slice/escape/BEGIN/next.java
+++ b/slice2java/ruby/test/Slice/escape/BEGIN/next.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3375563427692649126L;
+    private static final long serialVersionUID = 3375563426337210543L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java
index 8b5e509c611b..2b4cb3f1debc 100644
--- a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java
+++ b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6723520074050267631L;
+    private static final long serialVersionUID = 7821832509356051823L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/Clash/Cls.java b/slice2java/ruby/test/Slice/escape/Clash/Cls.java
index 7abf5102c11a..b985c7c24467 100644
--- a/slice2java/ruby/test/Slice/escape/Clash/Cls.java
+++ b/slice2java/ruby/test/Slice/escape/Clash/Cls.java
@@ -164,7 +164,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4871969496631607168L;
+    private static final long serialVersionUID = -3274214513717266968L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/escape/Clash/Ex.java b/slice2java/ruby/test/Slice/escape/Clash/Ex.java
index 01dd496b2c37..fb8c8f9eed91 100644
--- a/slice2java/ruby/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/ruby/test/Slice/escape/Clash/Ex.java
@@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7566314189631318611L;
+    private static final long serialVersionUID = 1625352619557265500L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/Clash/St.java b/slice2java/ruby/test/Slice/escape/Clash/St.java
index 68f6b95e5b0f..5ec3e399753b 100644
--- a/slice2java/ruby/test/Slice/escape/Clash/St.java
+++ b/slice2java/ruby/test/Slice/escape/Clash/St.java
@@ -187,5 +187,5 @@ static public java.util.Optional<St> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final St _nullMarshalValue = new St();
 
     /** @hidden */
-    private static final long serialVersionUID = -3254578194241831790L;
+    private static final long serialVersionUID = -4196686731811306443L;
 }
diff --git a/slice2java/ruby/test/Slice/macros/Test/Default.java b/slice2java/ruby/test/Slice/macros/Test/Default.java
index fb4789103c83..9ec985cb6e28 100644
--- a/slice2java/ruby/test/Slice/macros/Test/Default.java
+++ b/slice2java/ruby/test/Slice/macros/Test/Default.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1673160355939036194L;
+    private static final long serialVersionUID = -550905352320778306L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java
index 2008c1a96fa9..116747f5e545 100644
--- a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java
+++ b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2639520435834393663L;
+    private static final long serialVersionUID = 1036681539810904543L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/structure/Test/C.java b/slice2java/ruby/test/Slice/structure/Test/C.java
index 5e7102ab4211..417ef3ce974e 100644
--- a/slice2java/ruby/test/Slice/structure/Test/C.java
+++ b/slice2java/ruby/test/Slice/structure/Test/C.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3172273368570247855L;
+    private static final long serialVersionUID = -3172273930284091677L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/structure/Test/S1.java b/slice2java/ruby/test/Slice/structure/Test/S1.java
index 9ade67724181..9343faa2bd65 100644
--- a/slice2java/ruby/test/Slice/structure/Test/S1.java
+++ b/slice2java/ruby/test/Slice/structure/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = -5542866094522383501L;
+    private static final long serialVersionUID = -5542856066505979519L;
 }
diff --git a/slice2java/ruby/test/Slice/structure/Test/S2.java b/slice2java/ruby/test/Slice/structure/Test/S2.java
index 2a99fdabf529..73c17220b7d9 100644
--- a/slice2java/ruby/test/Slice/structure/Test/S2.java
+++ b/slice2java/ruby/test/Slice/structure/Test/S2.java
@@ -276,5 +276,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = -1460002811094168429L;
+    private static final long serialVersionUID = 6088103364871735393L;
 }
diff --git a/slice2java/scripts/Test/Common/Config.java b/slice2java/scripts/Test/Common/Config.java
index cdb8f84e04b0..8d83ff12dc88 100644
--- a/slice2java/scripts/Test/Common/Config.java
+++ b/slice2java/scripts/Test/Common/Config.java
@@ -493,7 +493,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -569470930802971415L;
+    private static final long serialVersionUID = -4562079288913203644L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/scripts/Test/Common/OptionOverrides.java b/slice2java/scripts/Test/Common/OptionOverrides.java
index de21fdf42e5c..19bc0b3eb0f6 100644
--- a/slice2java/scripts/Test/Common/OptionOverrides.java
+++ b/slice2java/scripts/Test/Common/OptionOverrides.java
@@ -402,7 +402,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4033718057642403252L;
+    private static final long serialVersionUID = -8951843729481293441L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/scripts/Test/Common/ProcessFailedException.java b/slice2java/scripts/Test/Common/ProcessFailedException.java
index b6ddd9c12a77..e3303dc83efa 100644
--- a/slice2java/scripts/Test/Common/ProcessFailedException.java
+++ b/slice2java/scripts/Test/Common/ProcessFailedException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5103744181746654347L;
+    private static final long serialVersionUID = 5103746511404235078L;
 }
diff --git a/slice2java/scripts/Test/Common/TestCaseFailedException.java b/slice2java/scripts/Test/Common/TestCaseFailedException.java
index 6318640ae18c..0d3e8a415da5 100644
--- a/slice2java/scripts/Test/Common/TestCaseFailedException.java
+++ b/slice2java/scripts/Test/Common/TestCaseFailedException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7577593971649374745L;
+    private static final long serialVersionUID = 7577601790190763092L;
 }
diff --git a/slice2java/scripts/Test/Common/TestCaseNotExistException.java b/slice2java/scripts/Test/Common/TestCaseNotExistException.java
index ba0927894525..ea9040741629 100644
--- a/slice2java/scripts/Test/Common/TestCaseNotExistException.java
+++ b/slice2java/scripts/Test/Common/TestCaseNotExistException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8656774386294705145L;
+    private static final long serialVersionUID = -8656782285063710006L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java
index e56f282f0ece..63c7801a1ff0 100644
--- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java
+++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8990437905328028704L;
+    private static final long serialVersionUID = 8990440272863058881L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java
index a20a99100806..0ee3fb1be6a7 100644
--- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java
+++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java
@@ -96,7 +96,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4918313145116620194L;
+    private static final long serialVersionUID = -7040951680509202940L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java
index 573c258011a9..d7eca87dd775 100644
--- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java
+++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5089368093199680998L;
+    private static final long serialVersionUID = -5089366827513256141L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java
index b947afb20ff8..d9879fb3d03b 100644
--- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java
+++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java
@@ -224,5 +224,5 @@ static public java.util.Optional<SSLInfo> ice_read(com.zeroc.Ice.InputStream ist
     private static final SSLInfo _nullMarshalValue = new SSLInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 7958236013068628255L;
+    private static final long serialVersionUID = -7364257891545344227L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java
index b0645d4334d0..b2f634e9981d 100644
--- a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java
+++ b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java
@@ -151,5 +151,5 @@ static public java.util.Optional<EncodingVersion> ice_read(com.zeroc.Ice.InputSt
     private static final EncodingVersion _nullMarshalValue = new EncodingVersion();
 
     /** @hidden */
-    private static final long serialVersionUID = -784338123908807567L;
+    private static final long serialVersionUID = 6384236217264370705L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java
index 2174d8011a7f..ee307d5150bc 100644
--- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java
+++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java
@@ -64,7 +64,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7437444667971219610L;
+    private static final long serialVersionUID = -616068451970044422L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java
index b3d39f70a028..1d2239f0de17 100644
--- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java
+++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ConnectionMetrics.java
@@ -61,7 +61,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2126841604478659017L;
+    private static final long serialVersionUID = 5846468032005094999L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java
index dd83c8d516b3..83c7024c07d6 100644
--- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java
+++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/DispatchMetrics.java
@@ -68,7 +68,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6661333692137547653L;
+    private static final long serialVersionUID = -1419692845168585944L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java
index 4b076ff2b76e..4f028ab6f3d5 100644
--- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java
+++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/InvocationMetrics.java
@@ -77,7 +77,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1275191814343956561L;
+    private static final long serialVersionUID = 7678162883003857935L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java
index 001609bda81c..dd71b40d1479 100644
--- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java
+++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/Metrics.java
@@ -83,7 +83,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1927354439779265992L;
+    private static final long serialVersionUID = 7334936226693931483L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java
index 029c50e14d5e..f136191836a1 100644
--- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java
+++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/MetricsFailures.java
@@ -165,5 +165,5 @@ static public java.util.Optional<MetricsFailures> ice_read(com.zeroc.Ice.InputSt
     private static final MetricsFailures _nullMarshalValue = new MetricsFailures();
 
     /** @hidden */
-    private static final long serialVersionUID = -2182092190443593147L;
+    private static final long serialVersionUID = -6221348933397473851L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java
index ea706042dbde..bda5e8283849 100644
--- a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java
+++ b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java
@@ -69,7 +69,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6755838718096563197L;
+    private static final long serialVersionUID = 2967091863386633070L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java
index 13f32ae935da..55dd26475b29 100644
--- a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java
+++ b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java
@@ -171,5 +171,5 @@ static public java.util.Optional<Identity> ice_read(com.zeroc.Ice.InputStream is
     private static final Identity _nullMarshalValue = new Identity();
 
     /** @hidden */
-    private static final long serialVersionUID = 5908860059732390821L;
+    private static final long serialVersionUID = 53847815730538533L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java
index 774c2e15608f..3ecffd7a39c0 100644
--- a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java
+++ b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java
@@ -197,5 +197,5 @@ static public java.util.Optional<LogMessage> ice_read(com.zeroc.Ice.InputStream
     private static final LogMessage _nullMarshalValue = new LogMessage();
 
     /** @hidden */
-    private static final long serialVersionUID = -6389041561270457196L;
+    private static final long serialVersionUID = -5010709449870137452L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java
index 51bc37d3bbcd..81f49f67885e 100644
--- a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java
+++ b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java
@@ -151,5 +151,5 @@ static public java.util.Optional<ProtocolVersion> ice_read(com.zeroc.Ice.InputSt
     private static final ProtocolVersion _nullMarshalValue = new ProtocolVersion();
 
     /** @hidden */
-    private static final long serialVersionUID = -4933572642211225884L;
+    private static final long serialVersionUID = -5929844815724212924L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java
index 54337af16871..455807fe8497 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5447244513615694412L;
+    private static final long serialVersionUID = 5447253946535618165L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java
index 88dc2ef15933..5b970345e45a 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java
@@ -278,5 +278,5 @@ static public java.util.Optional<AdapterDescriptor> ice_read(com.zeroc.Ice.Input
     private static final AdapterDescriptor _nullMarshalValue = new AdapterDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = 6476972470967942359L;
+    private static final long serialVersionUID = 1739762960862805346L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java
index 7ebdd731ff7b..ea043a9bbafb 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java
@@ -165,5 +165,5 @@ static public java.util.Optional<AdapterDynamicInfo> ice_read(com.zeroc.Ice.Inpu
     private static final AdapterDynamicInfo _nullMarshalValue = new AdapterDynamicInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -2837034064216820069L;
+    private static final long serialVersionUID = -5584449566524266797L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java
index d59b55d1b66e..23a7d7909952 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java
@@ -182,5 +182,5 @@ static public java.util.Optional<AdapterInfo> ice_read(com.zeroc.Ice.InputStream
     private static final AdapterInfo _nullMarshalValue = new AdapterInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -5291832618305330514L;
+    private static final long serialVersionUID = 7270127912467863631L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java
index b06fc68268f0..2e0dc75dfff2 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -243190539533837500L;
+    private static final long serialVersionUID = -243180424718827139L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java
index 473bb3872ba0..d80d6eaddf83 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java
@@ -55,7 +55,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7644438429247798216L;
+    private static final long serialVersionUID = 7644445966204331485L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java
index e6791b219c73..498f19cc7e29 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4699852422862890508L;
+    private static final long serialVersionUID = 4699861690474914229L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java
index 9a383fece6da..436cfe96c4fc 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java
@@ -288,5 +288,5 @@ static public java.util.Optional<ApplicationDescriptor> ice_read(com.zeroc.Ice.I
     private static final ApplicationDescriptor _nullMarshalValue = new ApplicationDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = 7901792619607448878L;
+    private static final long serialVersionUID = 7176071697200261175L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java
index 2b0d0e2c364e..d361a457b76f 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java
@@ -239,5 +239,5 @@ static public java.util.Optional<ApplicationInfo> ice_read(com.zeroc.Ice.InputSt
     private static final ApplicationInfo _nullMarshalValue = new ApplicationInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 1329507356567498812L;
+    private static final long serialVersionUID = -5894139880206340182L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java
index 130d0727d981..5d6c19bfc8b6 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7270578161950519229L;
+    private static final long serialVersionUID = -7270587303079324614L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java
index d9ee23de3d7d..6caf23040656 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java
@@ -364,5 +364,5 @@ static public java.util.Optional<ApplicationUpdateDescriptor> ice_read(com.zeroc
     private static final ApplicationUpdateDescriptor _nullMarshalValue = new ApplicationUpdateDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = -1211273018710095526L;
+    private static final long serialVersionUID = 8549738224400396155L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java
index f60189b15b80..ecee70150a42 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java
@@ -192,5 +192,5 @@ static public java.util.Optional<ApplicationUpdateInfo> ice_read(com.zeroc.Ice.I
     private static final ApplicationUpdateInfo _nullMarshalValue = new ApplicationUpdateInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 6647766125912047502L;
+    private static final long serialVersionUID = 5270861359310778816L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java
index 1d9fec4b7751..b1759c191be1 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4463357299606031141L;
+    private static final long serialVersionUID = 4463369813812269468L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java
index 541f7f0e7332..1def5786234c 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java
@@ -52,7 +52,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1971531027812314773L;
+    private static final long serialVersionUID = -1971527334285752207L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java
index c377461289dc..b347365e286b 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java
@@ -52,7 +52,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2108805317239014801L;
+    private static final long serialVersionUID = -2108811570441895814L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java
index df3aaee7cf2d..3388039ea349 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java
@@ -71,7 +71,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7049438607568675100L;
+    private static final long serialVersionUID = -6958975259690972051L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java
index 7eec0f80fe20..0bc793e42df2 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6801508908246563387L;
+    private static final long serialVersionUID = -6801501518585365572L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java
index 29cf104410ca..2d0efc38e3e4 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java
@@ -185,5 +185,5 @@ static public java.util.Optional<DistributionDescriptor> ice_read(com.zeroc.Ice.
     private static final DistributionDescriptor _nullMarshalValue = new DistributionDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = 6971449171757111271L;
+    private static final long serialVersionUID = -3455397990628146865L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java
index 5ee96b1c4190..f2ab7b46761b 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java
@@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8985150176445799178L;
+    private static final long serialVersionUID = -8985151264046905329L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java
index 982077ef52b7..069e98edbe49 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2337756785727687557L;
+    private static final long serialVersionUID = 2337767218019971007L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java
index e871dc1bd45f..7d384c1f89ca 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java
@@ -52,7 +52,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6003729593594980035L;
+    private static final long serialVersionUID = -6003731675386355928L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java
index c199c74d3b11..7cc74e863702 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java
@@ -170,5 +170,5 @@ static public java.util.Optional<LoadInfo> ice_read(com.zeroc.Ice.InputStream is
     private static final LoadInfo _nullMarshalValue = new LoadInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -1851746088754710090L;
+    private static final long serialVersionUID = 5644678955335770539L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java
index fdc27bcb7ba8..f85a0de99f70 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java
@@ -239,5 +239,5 @@ static public java.util.Optional<NodeDescriptor> ice_read(com.zeroc.Ice.InputStr
     private static final NodeDescriptor _nullMarshalValue = new NodeDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = -7193934665234156990L;
+    private static final long serialVersionUID = -6705360594660530801L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java
index dfb6fe1b8cde..19126170174c 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java
@@ -181,5 +181,5 @@ static public java.util.Optional<NodeDynamicInfo> ice_read(com.zeroc.Ice.InputSt
     private static final NodeDynamicInfo _nullMarshalValue = new NodeDynamicInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -4928332829418545752L;
+    private static final long serialVersionUID = 4108195927998250625L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java
index 511e64ed518f..080cce29319b 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java
@@ -265,5 +265,5 @@ static public java.util.Optional<NodeInfo> ice_read(com.zeroc.Ice.InputStream is
     private static final NodeInfo _nullMarshalValue = new NodeInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 8799163249212210519L;
+    private static final long serialVersionUID = 2960759592539064889L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java
index 7ccc831373f2..186645e24dd4 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5774525541598468967L;
+    private static final long serialVersionUID = -5774529870333521696L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java
index c205b12be394..ef023573ca5a 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java
@@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5045964443073641052L;
+    private static final long serialVersionUID = 7540882210202155364L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java
index bdb1e694e49d..eb717e842bb0 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java
@@ -293,5 +293,5 @@ static public java.util.Optional<NodeUpdateDescriptor> ice_read(com.zeroc.Ice.In
     private static final NodeUpdateDescriptor _nullMarshalValue = new NodeUpdateDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = 4804092399296698043L;
+    private static final long serialVersionUID = 1045279148195884190L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java
index ef57917fdf0f..7b46f72d2f3a 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java
@@ -184,5 +184,5 @@ static public java.util.Optional<ObjectDescriptor> ice_read(com.zeroc.Ice.InputS
     private static final ObjectDescriptor _nullMarshalValue = new ObjectDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = 8091362827066814978L;
+    private static final long serialVersionUID = 7073713924908144537L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java
index 83cff9d064d8..3db1bf32f616 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6991431779861017103L;
+    private static final long serialVersionUID = 6991425363582484086L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java
index e8e6c18fe7e7..50dd2831f14a 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java
@@ -165,5 +165,5 @@ static public java.util.Optional<ObjectInfo> ice_read(com.zeroc.Ice.InputStream
     private static final ObjectInfo _nullMarshalValue = new ObjectInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 5138762724433803097L;
+    private static final long serialVersionUID = 1940003719488206513L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java
index 066124d818da..eebe4a51faf0 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7672370433357833938L;
+    private static final long serialVersionUID = 7672382469801233003L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java
index 95befbcd8806..ff26ac410e54 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2733097795372257436L;
+    private static final long serialVersionUID = 2733093817612807077L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java
index 10d05fa0b36e..6699ab088403 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5694234840026951079L;
+    private static final long serialVersionUID = -5694235283170904480L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java
index 4f9732283e85..7af5b191ccd7 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7526798393366328656L;
+    private static final long serialVersionUID = 7526797636684479081L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java
index 5bb9b3619d49..95d3bb19ed4e 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java
@@ -166,5 +166,5 @@ static public java.util.Optional<PropertyDescriptor> ice_read(com.zeroc.Ice.Inpu
     private static final PropertyDescriptor _nullMarshalValue = new PropertyDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = -6743431168015680412L;
+    private static final long serialVersionUID = -4412590385518406460L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java
index 2adb20787b75..1ff480f1f120 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java
@@ -161,5 +161,5 @@ static public java.util.Optional<PropertySetDescriptor> ice_read(com.zeroc.Ice.I
     private static final PropertySetDescriptor _nullMarshalValue = new PropertySetDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = -2414007623605107541L;
+    private static final long serialVersionUID = 4855201561540257335L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java
index 7a1fd12c768f..f0456aa28780 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java
@@ -166,5 +166,5 @@ static public java.util.Optional<RegistryInfo> ice_read(com.zeroc.Ice.InputStrea
     private static final RegistryInfo _nullMarshalValue = new RegistryInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -8873157693832355353L;
+    private static final long serialVersionUID = 3597249329514974759L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java
index a71945cf8f7d..9cec59473ec9 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8544192059732836588L;
+    private static final long serialVersionUID = 8544195871880702741L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java
index c7b7597a3af6..b43b4218a37e 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java
@@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2503602061335999119L;
+    private static final long serialVersionUID = 1373220716567123121L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java
index 7b774b022da6..6d3288912b0b 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java
@@ -232,5 +232,5 @@ static public java.util.Optional<ReplicaGroupDescriptor> ice_read(com.zeroc.Ice.
     private static final ReplicaGroupDescriptor _nullMarshalValue = new ReplicaGroupDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = 4500136904785869398L;
+    private static final long serialVersionUID = -7941971877164363420L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java
index 8e6f4e0e2de2..38037ee0ee61 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java
@@ -136,7 +136,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5677955469647166965L;
+    private static final long serialVersionUID = 1995930758968941873L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java
index d1c5ddfafaea..0f88817cb91c 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java
@@ -192,5 +192,5 @@ static public java.util.Optional<ServerDynamicInfo> ice_read(com.zeroc.Ice.Input
     private static final ServerDynamicInfo _nullMarshalValue = new ServerDynamicInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 5762081450995095496L;
+    private static final long serialVersionUID = 6390900031733398816L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java
index 3b0850508d13..363bc6f73a89 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java
@@ -229,5 +229,5 @@ static public java.util.Optional<ServerInfo> ice_read(com.zeroc.Ice.InputStream
     private static final ServerInfo _nullMarshalValue = new ServerInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 833608114008300395L;
+    private static final long serialVersionUID = 6643039025367532409L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java
index 0f354d9ffd60..eaf0ef8955e9 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java
@@ -199,5 +199,5 @@ static public java.util.Optional<ServerInstanceDescriptor> ice_read(com.zeroc.Ic
     private static final ServerInstanceDescriptor _nullMarshalValue = new ServerInstanceDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = -6652916388241633818L;
+    private static final long serialVersionUID = 519223691982807671L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java
index 411d0267976f..483e72968a8b 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2699421840170181706L;
+    private static final long serialVersionUID = -2699423092775591857L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java
index 8ef5293affdc..29a5a1fe2a26 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java
@@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5240262638796783609L;
+    private static final long serialVersionUID = -6863981756197719993L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java
index 4a401eae5b2f..fd13ee735f5b 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java
@@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8922684571500054143L;
+    private static final long serialVersionUID = 5515215956677867455L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java
index fdfa269ddaf4..95c3a6945be9 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java
@@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3772877192526023649L;
+    private static final long serialVersionUID = 4754015668734188321L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java
index f8e8a17167d4..8aa361219c60 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java
@@ -61,7 +61,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9004463730810875769L;
+    private static final long serialVersionUID = -4171896909627160039L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java
index 19d0c1fb9b47..8f8f284d4778 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java
@@ -198,5 +198,5 @@ static public java.util.Optional<ServiceInstanceDescriptor> ice_read(com.zeroc.I
     private static final ServiceInstanceDescriptor _nullMarshalValue = new ServiceInstanceDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = 2911605804480988122L;
+    private static final long serialVersionUID = -8876713329894896542L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java
index c20fd39df574..6706ab234463 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java
@@ -198,5 +198,5 @@ static public java.util.Optional<TemplateDescriptor> ice_read(com.zeroc.Ice.Inpu
     private static final TemplateDescriptor _nullMarshalValue = new TemplateDescriptor();
 
     /** @hidden */
-    private static final long serialVersionUID = 8319297429191321981L;
+    private static final long serialVersionUID = -5059201853263922331L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java
index 9afdfa1c2e64..bcd80321fcac 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7896660141420378386L;
+    private static final long serialVersionUID = 7896653652928346300L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java
index 537bfa16266b..3be7b26d4fea 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java
@@ -68,7 +68,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5299562897730332988L;
+    private static final long serialVersionUID = -3128374602866322309L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java
index 7f3ffddaf30d..2e508a0ed5f6 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/TopicMetrics.java
@@ -61,7 +61,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2674410600578345535L;
+    private static final long serialVersionUID = 6000166054505712289L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java
index 34e87f6bb785..25b061e5fc19 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1090054916141305933L;
+    private static final long serialVersionUID = -1090061487438946531L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java
index b8c06fc85489..d2cdd161ea3d 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 243162039561698267L;
+    private static final long serialVersionUID = 243156145457841589L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java
index 084e2d78e402..593f7e89920d 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java
@@ -178,5 +178,5 @@ static public java.util.Optional<LinkInfo> ice_read(com.zeroc.Ice.InputStream is
     private static final LinkInfo _nullMarshalValue = new LinkInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 5753637122618673184L;
+    private static final long serialVersionUID = -5427726909353948018L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java
index a9ae62e685d7..2830d26717c5 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8653880778183111817L;
+    private static final long serialVersionUID = -8653870828718322215L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java
index cdfed77399a3..2956dd1685bf 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6283749715349682986L;
+    private static final long serialVersionUID = -6283739683079284872L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java
index 76b17f8bc514..ea72040c54ac 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3979369107262422714L;
+    private static final long serialVersionUID = 3979363130352957780L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Base.java b/slice2java/swift/test/Ice/defaultValue/Test/Base.java
index daeecef8c644..f023b65cc466 100644
--- a/slice2java/swift/test/Ice/defaultValue/Test/Base.java
+++ b/slice2java/swift/test/Ice/defaultValue/Test/Base.java
@@ -106,7 +106,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2504297049364307163L;
+    private static final long serialVersionUID = 6904343972799052485L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java
index 39d742f3da2f..f95ff5537981 100644
--- a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5491452478498411345L;
+    private static final long serialVersionUID = 5480668679447734897L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java
index 83d1057afcfa..8a51c1a2656c 100644
--- a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java
+++ b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java
@@ -68,7 +68,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -671906219958008949L;
+    private static final long serialVersionUID = 1107487321040356555L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java
index b4052c161516..c163569d8f08 100644
--- a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java
@@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3618068413281270076L;
+    private static final long serialVersionUID = -3388057660453002628L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java
index 68c2af05a181..db472d9bd846 100644
--- a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java
+++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct1> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct1 _nullMarshalValue = new Struct1();
 
     /** @hidden */
-    private static final long serialVersionUID = 6397306749557487534L;
+    private static final long serialVersionUID = 6578632967801097902L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java
index ff323ec984a0..db2a74b3fd41 100644
--- a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java
+++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java
@@ -370,5 +370,5 @@ static public java.util.Optional<Struct2> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct2 _nullMarshalValue = new Struct2();
 
     /** @hidden */
-    private static final long serialVersionUID = 8882646821849999156L;
+    private static final long serialVersionUID = 8945646325125624340L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java
index 9fa757b9699f..9161f1fa11ef 100644
--- a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java
+++ b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct3> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct3 _nullMarshalValue = new Struct3();
 
     /** @hidden */
-    private static final long serialVersionUID = 8634446417898163372L;
+    private static final long serialVersionUID = -7776966127033350996L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/A.java b/slice2java/swift/test/Ice/exceptions/Test/A.java
index 9644fc8af4b5..187e8330d6c0 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/A.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823745083281806927L;
+    private static final long serialVersionUID = 7823741933260035510L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/B.java b/slice2java/swift/test/Ice/exceptions/Test/B.java
index d8e1ec1b0d19..e21109c0cc25 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/B.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861410815382006641L;
+    private static final long serialVersionUID = -3861419420408081034L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/C.java b/slice2java/swift/test/Ice/exceptions/Test/C.java
index 0b4ebe913341..8cec04bbef75 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/C.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080698774484592207L;
+    private static final long serialVersionUID = 1080695624462820790L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/D.java b/slice2java/swift/test/Ice/exceptions/Test/D.java
index 230b099ecdb9..518ca58c87ac 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/D.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780381452720071567L;
+    private static final long serialVersionUID = 4780372847693997174L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/E.java b/slice2java/swift/test/Ice/exceptions/Test/E.java
index 485c9449c5a6..e57e59660c62 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/E.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/E.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1876968123582112793L;
+    private static final long serialVersionUID = -1876978012368910637L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/F.java b/slice2java/swift/test/Ice/exceptions/Test/F.java
index 4efb93333bf8..25fd6e70e14a 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/F.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/F.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 733475268323343268L;
+    private static final long serialVersionUID = 733479100098873552L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java
index 22a624d97cf7..de2518654d2d 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641414102331069477L;
+    private static final long serialVersionUID = -4641407625642497246L;
 }
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java
index d18ca91b54a9..c3c3e6fee9f2 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 954225992433587738L;
+    private static final long serialVersionUID = 954232799709851741L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/B.java b/slice2java/swift/test/Ice/inheritance/Test/MC/B.java
index 1d0c7ecb4dcd..66c0f288097f 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MC/B.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MC/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1339628378380499968L;
+    private static final long serialVersionUID = 1339629769324266439L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/C.java b/slice2java/swift/test/Ice/inheritance/Test/MC/C.java
index 26048cd926d5..0f5b31e88b5d 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MC/C.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MC/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2729311902897109630L;
+    private static final long serialVersionUID = -2729305056797385787L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/D.java b/slice2java/swift/test/Ice/inheritance/Test/MC/D.java
index 137f97b01c0e..c7c375fdabdd 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MC/D.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MC/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3435403801219080444L;
+    private static final long serialVersionUID = -3435402089982040381L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MD/A.java b/slice2java/swift/test/Ice/inheritance/Test/MD/A.java
index 0921c1058bfa..792c15b38133 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MD/A.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MD/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -836170930352864611L;
+    private static final long serialVersionUID = -836177610845692326L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MD/B.java b/slice2java/swift/test/Ice/inheritance/Test/MD/B.java
index 9c790680e3c7..03645d3fde64 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MD/B.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MD/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1132522966515654304L;
+    private static final long serialVersionUID = 1132524021834294631L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MD/C.java b/slice2java/swift/test/Ice/inheritance/Test/MD/C.java
index f0e3cb598ff8..c6e9dc385a64 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MD/C.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MD/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6335554954925122270L;
+    private static final long serialVersionUID = -6335559354762726811L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MD/D.java b/slice2java/swift/test/Ice/inheritance/Test/MD/D.java
index 5e6687d07916..74772bfeb96e 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MD/D.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MD/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4007409716702465884L;
+    private static final long serialVersionUID = -4007408341090551965L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/ME/A.java b/slice2java/swift/test/Ice/inheritance/Test/ME/A.java
index c539d2aacffa..5df790efcd89 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/ME/A.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/ME/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 991425115394627484L;
+    private static final long serialVersionUID = 991426787808207707L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/ME/B.java b/slice2java/swift/test/Ice/inheritance/Test/ME/B.java
index 81db1859aae3..c57e7badd62e 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/ME/B.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/ME/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2880333948275106496L;
+    private static final long serialVersionUID = -2880332722643840249L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/ME/C.java b/slice2java/swift/test/Ice/inheritance/Test/ME/C.java
index cdc96265bac8..d2d839dec27d 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/ME/C.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/ME/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8808278355276741438L;
+    private static final long serialVersionUID = -8808271674480317947L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/ME/D.java b/slice2java/swift/test/Ice/inheritance/Test/ME/D.java
index a07778d3f90b..1dfafb6e7f84 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/ME/D.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/ME/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -771852927317241532L;
+    private static final long serialVersionUID = -771851381392701693L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MF/A.java b/slice2java/swift/test/Ice/inheritance/Test/MF/A.java
index 0dc0916d7fa6..1f7b8258d089 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MF/A.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MF/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6566353885482154271L;
+    private static final long serialVersionUID = 6566352660154483800L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MF/B.java b/slice2java/swift/test/Ice/inheritance/Test/MF/B.java
index d19882e89ce2..d7d0c054c7b5 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MF/B.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MF/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6983805171492207584L;
+    private static final long serialVersionUID = 6983795481498349735L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MF/C.java b/slice2java/swift/test/Ice/inheritance/Test/MF/C.java
index 86ae40eda81c..8568450fa85c 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MF/C.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MF/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1175224754624463006L;
+    private static final long serialVersionUID = -1175218079140961371L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MF/D.java b/slice2java/swift/test/Ice/inheritance/Test/MF/D.java
index 3ab2e7bad9b8..c9fa8787aaa7 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MF/D.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MF/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3279712724742889244L;
+    private static final long serialVersionUID = -3279722094443473501L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MG/A.java b/slice2java/swift/test/Ice/inheritance/Test/MG/A.java
index 3fe1c19f6127..1a857e289ee0 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MG/A.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MG/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4359175417959010530L;
+    private static final long serialVersionUID = -4359168290389472935L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MG/B.java b/slice2java/swift/test/Ice/inheritance/Test/MG/B.java
index 9a825f5d2849..4266e289c057 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MG/B.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MG/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5904685165931888000L;
+    private static final long serialVersionUID = 5904686556875654471L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MG/C.java b/slice2java/swift/test/Ice/inheritance/Test/MG/C.java
index f86ed794e902..f50321eae4f0 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MG/C.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MG/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1835744884654278402L;
+    private static final long serialVersionUID = 1835751730754002245L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MG/D.java b/slice2java/swift/test/Ice/inheritance/Test/MG/D.java
index 309e30d9d43d..3c03ac56c49c 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MG/D.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MG/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2252404454449397628L;
+    private static final long serialVersionUID = -2252402743212357565L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MH/A.java b/slice2java/swift/test/Ice/inheritance/Test/MH/A.java
index edb5c93e49b9..ddc881a7e78a 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MH/A.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MH/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1203529363006815343L;
+    private static final long serialVersionUID = -1203536363792916650L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MH/B.java b/slice2java/swift/test/Ice/inheritance/Test/MH/B.java
index 6450f6a7e166..00d236c36a34 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MH/B.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MH/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7537769065071630816L;
+    private static final long serialVersionUID = -7537768009752990489L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MH/C.java b/slice2java/swift/test/Ice/inheritance/Test/MH/C.java
index b51fb5a347c6..9d1d4a739075 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MH/C.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MH/C.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3440897087197144226L;
+    private static final long serialVersionUID = 3440892687359539685L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MH/D.java b/slice2java/swift/test/Ice/inheritance/Test/MH/D.java
index 0f1125142095..89e92f79c69c 100644
--- a/slice2java/swift/test/Ice/inheritance/Test/MH/D.java
+++ b/slice2java/swift/test/Ice/inheritance/Test/MH/D.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9151099766201505828L;
+    private static final long serialVersionUID = 9151101141813419747L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/A.java b/slice2java/swift/test/Ice/objects/Test/A.java
index 4dcf33845396..6c1eb7745af8 100644
--- a/slice2java/swift/test/Ice/objects/Test/A.java
+++ b/slice2java/swift/test/Ice/objects/Test/A.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1544898880280154760L;
+    private static final long serialVersionUID = -8866440501896297321L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/A1.java b/slice2java/swift/test/Ice/objects/Test/A1.java
index 7e265b5b332d..8b5f2c11c92d 100644
--- a/slice2java/swift/test/Ice/objects/Test/A1.java
+++ b/slice2java/swift/test/Ice/objects/Test/A1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5926745421874565349L;
+    private static final long serialVersionUID = -5926742039446008163L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/B.java b/slice2java/swift/test/Ice/objects/Test/B.java
index e9d0a430c3a8..f2394159792b 100644
--- a/slice2java/swift/test/Ice/objects/Test/B.java
+++ b/slice2java/swift/test/Ice/objects/Test/B.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8890916630326784179L;
+    private static final long serialVersionUID = -8890919855147421784L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/B1.java b/slice2java/swift/test/Ice/objects/Test/B1.java
index 02974f09322a..25adc88c1e7e 100644
--- a/slice2java/swift/test/Ice/objects/Test/B1.java
+++ b/slice2java/swift/test/Ice/objects/Test/B1.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -775297479108590268L;
+    private static final long serialVersionUID = 1657001720122730116L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Base.java b/slice2java/swift/test/Ice/objects/Test/Base.java
index 34082e8ac2d3..b70234ace3f8 100644
--- a/slice2java/swift/test/Ice/objects/Test/Base.java
+++ b/slice2java/swift/test/Ice/objects/Test/Base.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5617842153433518150L;
+    private static final long serialVersionUID = -2785506232689265994L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/BaseEx.java b/slice2java/swift/test/Ice/objects/Test/BaseEx.java
index 13093cb4a909..19bee744edf0 100644
--- a/slice2java/swift/test/Ice/objects/Test/BaseEx.java
+++ b/slice2java/swift/test/Ice/objects/Test/BaseEx.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3897765445297906633L;
+    private static final long serialVersionUID = 3897767835879067983L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/C.java b/slice2java/swift/test/Ice/objects/Test/C.java
index 454f46497c5b..4cf75c12df2a 100644
--- a/slice2java/swift/test/Ice/objects/Test/C.java
+++ b/slice2java/swift/test/Ice/objects/Test/C.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -327574233613295550L;
+    private static final long serialVersionUID = 7542446071464253868L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/COneMember.java b/slice2java/swift/test/Ice/objects/Test/COneMember.java
index 7b568395463f..e86a57348138 100644
--- a/slice2java/swift/test/Ice/objects/Test/COneMember.java
+++ b/slice2java/swift/test/Ice/objects/Test/COneMember.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3050969860896440660L;
+    private static final long serialVersionUID = 3050972925466782672L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java
index 014329062e64..31d346ba6c84 100644
--- a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java
+++ b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5194308062346633317L;
+    private static final long serialVersionUID = -1565982341421111397L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/D.java b/slice2java/swift/test/Ice/objects/Test/D.java
index 9c66e7fc259d..a734006df6d5 100644
--- a/slice2java/swift/test/Ice/objects/Test/D.java
+++ b/slice2java/swift/test/Ice/objects/Test/D.java
@@ -57,7 +57,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2939054583951515201L;
+    private static final long serialVersionUID = -4402279760909577381L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/D1.java b/slice2java/swift/test/Ice/objects/Test/D1.java
index b85db8640008..3e862091b811 100644
--- a/slice2java/swift/test/Ice/objects/Test/D1.java
+++ b/slice2java/swift/test/Ice/objects/Test/D1.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 97135020470725379L;
+    private static final long serialVersionUID = -7347566816644714301L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Derived.java b/slice2java/swift/test/Ice/objects/Test/Derived.java
index 3bb77622f598..c1c9210e24da 100644
--- a/slice2java/swift/test/Ice/objects/Test/Derived.java
+++ b/slice2java/swift/test/Ice/objects/Test/Derived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1587922506996285218L;
+    private static final long serialVersionUID = -1587929185248656664L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/E.java b/slice2java/swift/test/Ice/objects/Test/E.java
index 2e8dfb9d670c..5f9827721f86 100644
--- a/slice2java/swift/test/Ice/objects/Test/E.java
+++ b/slice2java/swift/test/Ice/objects/Test/E.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4742727529121676433L;
+    private static final long serialVersionUID = 7365181219762268998L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/EBase.java b/slice2java/swift/test/Ice/objects/Test/EBase.java
index 9709356217d9..a64c8780f676 100644
--- a/slice2java/swift/test/Ice/objects/Test/EBase.java
+++ b/slice2java/swift/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5477806608094842126L;
+    private static final long serialVersionUID = 1761267125092096078L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/EDerived.java b/slice2java/swift/test/Ice/objects/Test/EDerived.java
index dfef13df99c6..e9d389436611 100644
--- a/slice2java/swift/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/swift/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4415396078423339794L;
+    private static final long serialVersionUID = 3238716442292783186L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/EOneMember.java b/slice2java/swift/test/Ice/objects/Test/EOneMember.java
index 6c5b7e0fccb3..69865c04e860 100644
--- a/slice2java/swift/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/swift/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225291782008204197L;
+    private static final long serialVersionUID = -6225288068954644897L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java
index 8ca1682b10dd..ebe7f72ebc56 100644
--- a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4953302490328000788L;
+    private static final long serialVersionUID = -3707941078694836076L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/F.java b/slice2java/swift/test/Ice/objects/Test/F.java
index 3b4c10e7c414..857ade44785b 100644
--- a/slice2java/swift/test/Ice/objects/Test/F.java
+++ b/slice2java/swift/test/Ice/objects/Test/F.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5918584836617558353L;
+    private static final long serialVersionUID = -6111169130433213359L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/F1.java b/slice2java/swift/test/Ice/objects/Test/F1.java
index 7f1126da37a1..2d5b833d91c4 100644
--- a/slice2java/swift/test/Ice/objects/Test/F1.java
+++ b/slice2java/swift/test/Ice/objects/Test/F1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6192373242188585780L;
+    private static final long serialVersionUID = 6192372146860595104L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/F3.java b/slice2java/swift/test/Ice/objects/Test/F3.java
index baaf33370716..66adc009931f 100644
--- a/slice2java/swift/test/Ice/objects/Test/F3.java
+++ b/slice2java/swift/test/Ice/objects/Test/F3.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8233240196120349253L;
+    private static final long serialVersionUID = 1510616749780999375L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Inner/A.java b/slice2java/swift/test/Ice/objects/Test/Inner/A.java
index 5a3de61e0b51..5ad2b0b70b7f 100644
--- a/slice2java/swift/test/Ice/objects/Test/Inner/A.java
+++ b/slice2java/swift/test/Ice/objects/Test/Inner/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1425259092217053977L;
+    private static final long serialVersionUID = -1425257032185020862L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java b/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java
index 01ca912e2e7c..41586238b9ed 100644
--- a/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337224441958270942L;
+    private static final long serialVersionUID = -2337227839713549148L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java
index f21131825706..1300877f95e6 100644
--- a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java
+++ b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/A.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1298677165937138524L;
+    private static final long serialVersionUID = -1298680711118770154L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java
index 0bb3d5735dcc..44cb056149c9 100644
--- a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842232272300494406L;
+    private static final long serialVersionUID = 1842234014416833856L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/K.java b/slice2java/swift/test/Ice/objects/Test/K.java
index 4bbb3dcc121a..00d875c8dafd 100644
--- a/slice2java/swift/test/Ice/objects/Test/K.java
+++ b/slice2java/swift/test/Ice/objects/Test/K.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4645161212419752775L;
+    private static final long serialVersionUID = 4645163114904298507L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/L.java b/slice2java/swift/test/Ice/objects/Test/L.java
index afdb3f948449..6d9982546370 100644
--- a/slice2java/swift/test/Ice/objects/Test/L.java
+++ b/slice2java/swift/test/Ice/objects/Test/L.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6629737100454232528L;
+    private static final long serialVersionUID = 6629735195474789334L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/M.java b/slice2java/swift/test/Ice/objects/Test/M.java
index 735448f95813..7e3f9f7a11fb 100644
--- a/slice2java/swift/test/Ice/objects/Test/M.java
+++ b/slice2java/swift/test/Ice/objects/Test/M.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8088091090705450323L;
+    private static final long serialVersionUID = -8088093318490204695L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Recursive.java b/slice2java/swift/test/Ice/objects/Test/Recursive.java
index fbe838bb380d..93f13032f241 100644
--- a/slice2java/swift/test/Ice/objects/Test/Recursive.java
+++ b/slice2java/swift/test/Ice/objects/Test/Recursive.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3617876977216097821L;
+    private static final long serialVersionUID = 3617879199995380333L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/S.java b/slice2java/swift/test/Ice/objects/Test/S.java
index ffbc7d054587..9f9cda952682 100644
--- a/slice2java/swift/test/Ice/objects/Test/S.java
+++ b/slice2java/swift/test/Ice/objects/Test/S.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 481768426592812899L;
+    private static final long serialVersionUID = 481770491581299941L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/SOneMember.java b/slice2java/swift/test/Ice/objects/Test/SOneMember.java
index c5cc91c37957..5059b7fba0f0 100644
--- a/slice2java/swift/test/Ice/objects/Test/SOneMember.java
+++ b/slice2java/swift/test/Ice/objects/Test/SOneMember.java
@@ -142,5 +142,5 @@ static public java.util.Optional<SOneMember> ice_read(com.zeroc.Ice.InputStream
     private static final SOneMember _nullMarshalValue = new SOneMember();
 
     /** @hidden */
-    private static final long serialVersionUID = 6227760818206646861L;
+    private static final long serialVersionUID = 6227757268034591049L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java
index fe20c102794a..c8b4689e79d9 100644
--- a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java
+++ b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java
@@ -155,5 +155,5 @@ static public java.util.Optional<STwoMembers> ice_read(com.zeroc.Ice.InputStream
     private static final STwoMembers _nullMarshalValue = new STwoMembers();
 
     /** @hidden */
-    private static final long serialVersionUID = 3430702856279403394L;
+    private static final long serialVersionUID = -1328425595531555838L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/StructKey.java b/slice2java/swift/test/Ice/objects/Test/StructKey.java
index c0f3216e4245..c472781b3186 100644
--- a/slice2java/swift/test/Ice/objects/Test/StructKey.java
+++ b/slice2java/swift/test/Ice/objects/Test/StructKey.java
@@ -153,5 +153,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = -6072821862702569635L;
+    private static final long serialVersionUID = 1317514507509340298L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java
index 18099390bb61..c9594605698d 100644
--- a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java
+++ b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<AnotherStruct> ice_read(com.zeroc.Ice.InputStre
     private static final AnotherStruct _nullMarshalValue = new AnotherStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 2723841315717595778L;
+    private static final long serialVersionUID = 2723841554730013976L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/MyClass1.java b/slice2java/swift/test/Ice/operations/Test/MyClass1.java
index 730f6d230d1c..4b046d239499 100644
--- a/slice2java/swift/test/Ice/operations/Test/MyClass1.java
+++ b/slice2java/swift/test/Ice/operations/Test/MyClass1.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1679658388604587258L;
+    private static final long serialVersionUID = -2093813414705328627L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct.java b/slice2java/swift/test/Ice/operations/Test/MyStruct.java
index 83c64970623f..d4c5a60e65fe 100644
--- a/slice2java/swift/test/Ice/operations/Test/MyStruct.java
+++ b/slice2java/swift/test/Ice/operations/Test/MyStruct.java
@@ -148,5 +148,5 @@ static public java.util.Optional<MyStruct> ice_read(com.zeroc.Ice.InputStream is
     private static final MyStruct _nullMarshalValue = new MyStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 8706795666898528797L;
+    private static final long serialVersionUID = -240054482930934819L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java
index 1807fa8b8bab..1e47042ed83a 100644
--- a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java
+++ b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java
@@ -170,5 +170,5 @@ static public java.util.Optional<MyStruct1> ice_read(com.zeroc.Ice.InputStream i
     private static final MyStruct1 _nullMarshalValue = new MyStruct1();
 
     /** @hidden */
-    private static final long serialVersionUID = -5271453131176796941L;
+    private static final long serialVersionUID = 7355347231144820004L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/Structure.java b/slice2java/swift/test/Ice/operations/Test/Structure.java
index 6a18bbe91404..abad50e55398 100644
--- a/slice2java/swift/test/Ice/operations/Test/Structure.java
+++ b/slice2java/swift/test/Ice/operations/Test/Structure.java
@@ -170,5 +170,5 @@ static public java.util.Optional<Structure> ice_read(com.zeroc.Ice.InputStream i
     private static final Structure _nullMarshalValue = new Structure();
 
     /** @hidden */
-    private static final long serialVersionUID = -3016980949189438837L;
+    private static final long serialVersionUID = 8654599751847485842L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/A.java b/slice2java/swift/test/Ice/optional/Test/A.java
index 675b81add189..4f6c5207ab5b 100644
--- a/slice2java/swift/test/Ice/optional/Test/A.java
+++ b/slice2java/swift/test/Ice/optional/Test/A.java
@@ -213,7 +213,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8982606167610177648L;
+    private static final long serialVersionUID = -3332607515011932400L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/B.java b/slice2java/swift/test/Ice/optional/Test/B.java
index a1f864b56d5d..045a2b22d97a 100644
--- a/slice2java/swift/test/Ice/optional/Test/B.java
+++ b/slice2java/swift/test/Ice/optional/Test/B.java
@@ -108,7 +108,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7748859114798431517L;
+    private static final long serialVersionUID = 7331125044370893667L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/C.java b/slice2java/swift/test/Ice/optional/Test/C.java
index 5ab035e71824..06e6b0a24856 100644
--- a/slice2java/swift/test/Ice/optional/Test/C.java
+++ b/slice2java/swift/test/Ice/optional/Test/C.java
@@ -110,7 +110,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 97210907098742525L;
+    private static final long serialVersionUID = 2437146708672907773L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/DerivedException.java b/slice2java/swift/test/Ice/optional/Test/DerivedException.java
index d694b980cdd2..efba17011c30 100644
--- a/slice2java/swift/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/swift/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5236782326408824342L;
+    private static final long serialVersionUID = 1731166176479621083L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/E.java b/slice2java/swift/test/Ice/optional/Test/E.java
index 164ca3345b5d..8af0a49ec8be 100644
--- a/slice2java/swift/test/Ice/optional/Test/E.java
+++ b/slice2java/swift/test/Ice/optional/Test/E.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1850732512031587022L;
+    private static final long serialVersionUID = -1850731171579694591L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/F.java b/slice2java/swift/test/Ice/optional/Test/F.java
index b8e97597366d..cb1030d9c0dd 100644
--- a/slice2java/swift/test/Ice/optional/Test/F.java
+++ b/slice2java/swift/test/Ice/optional/Test/F.java
@@ -105,7 +105,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6430494002690754495L;
+    private static final long serialVersionUID = -6430489882968015630L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java
index da03027aa1b7..904e34771831 100644
--- a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java
+++ b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<FixedStruct> ice_read(com.zeroc.Ice.InputStream
     private static final FixedStruct _nullMarshalValue = new FixedStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 1569613770808244933L;
+    private static final long serialVersionUID = 1569609777593667872L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/G.java b/slice2java/swift/test/Ice/optional/Test/G.java
index b0b9a66bc14b..9d4e6b99030a 100644
--- a/slice2java/swift/test/Ice/optional/Test/G.java
+++ b/slice2java/swift/test/Ice/optional/Test/G.java
@@ -168,7 +168,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5656032719976959699L;
+    private static final long serialVersionUID = 1301675110466997587L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/G1.java b/slice2java/swift/test/Ice/optional/Test/G1.java
index 546bfd3de274..0adf3cd9a59c 100644
--- a/slice2java/swift/test/Ice/optional/Test/G1.java
+++ b/slice2java/swift/test/Ice/optional/Test/G1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<G1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G1 _nullMarshalValue = new G1();
 
     /** @hidden */
-    private static final long serialVersionUID = 7339783447697283992L;
+    private static final long serialVersionUID = 7339787440818562645L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/G2.java b/slice2java/swift/test/Ice/optional/Test/G2.java
index 96fcbbbc81dd..36ca82119802 100644
--- a/slice2java/swift/test/Ice/optional/Test/G2.java
+++ b/slice2java/swift/test/Ice/optional/Test/G2.java
@@ -138,5 +138,5 @@ static public java.util.Optional<G2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final G2 _nullMarshalValue = new G2();
 
     /** @hidden */
-    private static final long serialVersionUID = 3824558101305272892L;
+    private static final long serialVersionUID = 3824559441747183091L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java
index 248075e5d807..720f16b202a1 100644
--- a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java
+++ b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java
@@ -1675,7 +1675,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8348747831255566156L;
+    private static final long serialVersionUID = -605000759277773570L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/OneOptional.java b/slice2java/swift/test/Ice/optional/Test/OneOptional.java
index 21a0d4bf43ff..bd63c12a40da 100644
--- a/slice2java/swift/test/Ice/optional/Test/OneOptional.java
+++ b/slice2java/swift/test/Ice/optional/Test/OneOptional.java
@@ -96,7 +96,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7219608802685945109L;
+    private static final long serialVersionUID = -7219607495868350130L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalException.java b/slice2java/swift/test/Ice/optional/Test/OptionalException.java
index b590f3593c68..19101ac2ac3f 100644
--- a/slice2java/swift/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/swift/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5884575367857545497L;
+    private static final long serialVersionUID = 549524569443752363L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java
index 76cda9bef66a..3ecee2292a8d 100644
--- a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java
+++ b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java
@@ -186,7 +186,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7301125233075344571L;
+    private static final long serialVersionUID = 8590739256251177403L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/RequiredException.java b/slice2java/swift/test/Ice/optional/Test/RequiredException.java
index eec9b4741dab..b0e1fafd8fb7 100644
--- a/slice2java/swift/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/swift/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894245656177749073L;
+    private static final long serialVersionUID = 2894241541774409756L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java
index 90ded5501aee..0a6f5049fb7e 100644
--- a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java
+++ b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<SmallStruct> ice_read(com.zeroc.Ice.InputStream
     private static final SmallStruct _nullMarshalValue = new SmallStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 6700992031363110766L;
+    private static final long serialVersionUID = 6700996145773277733L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/VarStruct.java b/slice2java/swift/test/Ice/optional/Test/VarStruct.java
index 5aa3a04d06e6..751d7140fef3 100644
--- a/slice2java/swift/test/Ice/optional/Test/VarStruct.java
+++ b/slice2java/swift/test/Ice/optional/Test/VarStruct.java
@@ -143,5 +143,5 @@ static public java.util.Optional<VarStruct> ice_read(com.zeroc.Ice.InputStream i
     private static final VarStruct _nullMarshalValue = new VarStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -1912285419886877424L;
+    private static final long serialVersionUID = -1912281426765024803L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/WD.java b/slice2java/swift/test/Ice/optional/Test/WD.java
index 58fdaa11c712..65a7d6f8e1a4 100644
--- a/slice2java/swift/test/Ice/optional/Test/WD.java
+++ b/slice2java/swift/test/Ice/optional/Test/WD.java
@@ -152,7 +152,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3010266949439771117L;
+    private static final long serialVersionUID = -3425846953977920229L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C.java b/slice2java/swift/test/Ice/scope/Test/C.java
index d62b27ad5993..91beb5d3490c 100644
--- a/slice2java/swift/test/Ice/scope/Test/C.java
+++ b/slice2java/swift/test/Ice/scope/Test/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5190248434942963785L;
+    private static final long serialVersionUID = -5190244058063404022L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C1.java b/slice2java/swift/test/Ice/scope/Test/C1.java
index 9a3d80e6a5fb..8fcd41c1dce7 100644
--- a/slice2java/swift/test/Ice/scope/Test/C1.java
+++ b/slice2java/swift/test/Ice/scope/Test/C1.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8893234853753734966L;
+    private static final long serialVersionUID = 8893234935058991656L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C2.java b/slice2java/swift/test/Ice/scope/Test/C2.java
index d3a012dc6676..d2985325b0e3 100644
--- a/slice2java/swift/test/Ice/scope/Test/C2.java
+++ b/slice2java/swift/test/Ice/scope/Test/C2.java
@@ -59,7 +59,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7106307717211962982L;
+    private static final long serialVersionUID = 2485379477476582310L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/C.java b/slice2java/swift/test/Ice/scope/Test/Inner/C.java
index 4d982ea4e657..4645b60a70c7 100644
--- a/slice2java/swift/test/Ice/scope/Test/Inner/C.java
+++ b/slice2java/swift/test/Ice/scope/Test/Inner/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4615626644583010226L;
+    private static final long serialVersionUID = 4615627890698564659L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java
index 88238f1933e3..2c8922f922a5 100644
--- a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java
+++ b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/C.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 672593500629441055L;
+    private static final long serialVersionUID = 672588124084793894L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java
index 3942c228e5c7..b6b4acef35b5 100644
--- a/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java
+++ b/slice2java/swift/test/Ice/scope/Test/Inner/Inner2/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 8654437780798152493L;
+    private static final long serialVersionUID = 8654437534188955494L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/S.java
index 6d9d2fef0b14..779a7981e0e9 100644
--- a/slice2java/swift/test/Ice/scope/Test/Inner/S.java
+++ b/slice2java/swift/test/Ice/scope/Test/Inner/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 3694620444353905505L;
+    private static final long serialVersionUID = 3694613905745963690L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S.java b/slice2java/swift/test/Ice/scope/Test/S.java
index 8027a60f3b7b..fde57f806055 100644
--- a/slice2java/swift/test/Ice/scope/Test/S.java
+++ b/slice2java/swift/test/Ice/scope/Test/S.java
@@ -138,5 +138,5 @@ static public java.util.Optional<S> ice_read(com.zeroc.Ice.InputStream istr, int
     private static final S _nullMarshalValue = new S();
 
     /** @hidden */
-    private static final long serialVersionUID = 2159700920284816607L;
+    private static final long serialVersionUID = 2159702171616062868L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S1.java b/slice2java/swift/test/Ice/scope/Test/S1.java
index 6549fbdaf284..60775a04fdb5 100644
--- a/slice2java/swift/test/Ice/scope/Test/S1.java
+++ b/slice2java/swift/test/Ice/scope/Test/S1.java
@@ -143,5 +143,5 @@ static public java.util.Optional<S1> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S1 _nullMarshalValue = new S1();
 
     /** @hidden */
-    private static final long serialVersionUID = 1241678701700603279L;
+    private static final long serialVersionUID = 1241683600148066449L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S2.java b/slice2java/swift/test/Ice/scope/Test/S2.java
index c4e9957c3dbf..d78be04af5db 100644
--- a/slice2java/swift/test/Ice/scope/Test/S2.java
+++ b/slice2java/swift/test/Ice/scope/Test/S2.java
@@ -193,5 +193,5 @@ static public java.util.Optional<S2> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final S2 _nullMarshalValue = new S2();
 
     /** @hidden */
-    private static final long serialVersionUID = -464833011188451169L;
+    private static final long serialVersionUID = 6954106468835187423L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java
index e411a6d886d4..04e130b50bd0 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477016695075673719L;
+    private static final long serialVersionUID = -477023760782777861L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 6e5a8d8877f2..cb2bb91981e4 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485210294750579759L;
+    private static final long serialVersionUID = 3485214464971756957L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index ce3b170f0924..0b722cb313fa 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717370973316047326L;
+    private static final long serialVersionUID = 1717377708237014508L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 1f7bd47acacb..b414d35870e0 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384917064971454713L;
+    private static final long serialVersionUID = -7384918680660311819L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index c3c1d1c77d30..d8d1bda6b827 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424382536378258055L;
+    private static final long serialVersionUID = 3424382513300008425L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 3fc8bbe9a5c3..344dfbded390 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172594303079090986L;
+    private static final long serialVersionUID = -1172594445128904840L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index c3b8af2438a1..48774e90d97f 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126112476007497809L;
+    private static final long serialVersionUID = -1126112499256244607L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index 64fa15d782cb..8010e9dddeb1 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097571201020460913L;
+    private static final long serialVersionUID = -2097571224117684255L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/B.java b/slice2java/swift/test/Ice/slicing/objects/Test/B.java
index d78c8ff4216c..bf0336736a5f 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/B.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/B.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6621245357017558680L;
+    private static final long serialVersionUID = -1581870712422905162L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java b/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java
index ba2451912b25..1889e2a160b4 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -549673158588421596L;
+    private static final long serialVersionUID = -6047274101424885766L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 94014283d828..f8c0f3b07305 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6396993798487357920L;
+    private static final long serialVersionUID = -6396993272743605096L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java
index 06e2da5b0058..6cacdb187cdf 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9066888142029769825L;
+    private static final long serialVersionUID = -9066881817632960487L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/D1.java b/slice2java/swift/test/Ice/slicing/objects/Test/D1.java
index da855d0bb8fa..8600d4e6fcac 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/D1.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/D1.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6364405839434444245L;
+    private static final long serialVersionUID = -1354525232229464651L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/D2.java b/slice2java/swift/test/Ice/slicing/objects/Test/D2.java
index 20e61aef0e1e..acc76a63f358 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/D2.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/D2.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8439571078012083008L;
+    private static final long serialVersionUID = 3529349544955741824L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/D3.java b/slice2java/swift/test/Ice/slicing/objects/Test/D3.java
index ca080ce0af49..6e8fdc49c726 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/D3.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/D3.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1938555985349369350L;
+    private static final long serialVersionUID = 529452220326230458L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/D4.java b/slice2java/swift/test/Ice/slicing/objects/Test/D4.java
index 752b12f66af8..ec5406802617 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/D4.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/D4.java
@@ -50,7 +50,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3566902353172107661L;
+    private static final long serialVersionUID = -3229479008309145613L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java b/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java
index d9060edc2e21..b989bb7a4e35 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5972963041961329835L;
+    private static final long serialVersionUID = -6578603805948833594L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java
index 768f72e6271c..0d4fda46bf15 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7655927173468740110L;
+    private static final long serialVersionUID = -7655916966943322694L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java b/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java
index 65f861b8837d..efbd237f6d11 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/Hidden.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2271124686270449479L;
+    private static final long serialVersionUID = -2271134892976713977L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java b/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java
index 73959901c0ef..ad853f91abbf 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/MyClass.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4147521279990962487L;
+    private static final long serialVersionUID = 4147521189744471921L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java b/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java
index 82aa4ba9ec91..b2b0aaa682ff 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/PBase.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 481713067885930604L;
+    private static final long serialVersionUID = 481706828774807857L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java
index 483b2e6f51cb..57eb7e56afc3 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4426878660314108960L;
+    private static final long serialVersionUID = -4426878299878256168L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java
index 3da3c324e928..4f784428f9db 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 850535660438821412L;
+    private static final long serialVersionUID = 850536147399189724L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java
index f08e8620894c..f85285aa2da0 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCDerived3.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4328907008993105898L;
+    private static final long serialVersionUID = -4328906731371262162L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java
index e5ba132c10c6..6ec7cc4f730f 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/PCUnknown.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5081810272751026425L;
+    private static final long serialVersionUID = -5081810632999343553L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java
index 81a01d9954ea..5b55e4c6b520 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/PDerived.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 643086360291829656L;
+    private static final long serialVersionUID = 643076233813319582L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java b/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java
index 174f79d0d107..b9860f659917 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/PNode.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2438000779717861457L;
+    private static final long serialVersionUID = -2438007103899872608L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java
index 8748d3f29214..259c162534bd 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown.java
@@ -54,7 +54,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7492657823451827662L;
+    private static final long serialVersionUID = 1753577906905854152L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java
index 52243caf9c43..deff14ff33c4 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/PSUnknown2.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8813704874186892313L;
+    private static final long serialVersionUID = -8813704793954597471L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java
index fe9149052cb4..96432a87e846 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/Preserved.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3651532747020647658L;
+    private static final long serialVersionUID = 3651522540466164704L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java
index 7432ee504673..9467fc733ae0 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBSKnownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8804372243803637839L;
+    private static final long serialVersionUID = 8804373027788840901L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java
index 266f8884733d..8338870f0963 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBSUnknownDerived.java
@@ -48,7 +48,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4989054211422528528L;
+    private static final long serialVersionUID = -4989054121020058314L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java b/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java
index f863c40f7975..8bc740e8b12e 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/SBase.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5353754300126285959L;
+    private static final long serialVersionUID = -5353755004054776845L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java b/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java
index ca1fecd61ff6..1c44b7b87556 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS1.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6522141895641362237L;
+    private static final long serialVersionUID = -6522130281463662896L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java b/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java
index 9fe48e052da1..c3b46edb4a0d 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS2.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7620283216038113728L;
+    private static final long serialVersionUID = 7620289289977063379L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java b/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java
index f87112e5f507..42a84c571f73 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/SS3.java
@@ -155,5 +155,5 @@ static public java.util.Optional<SS3> ice_read(com.zeroc.Ice.InputStream istr, i
     private static final SS3 _nullMarshalValue = new SS3();
 
     /** @hidden */
-    private static final long serialVersionUID = -7276045833908509410L;
+    private static final long serialVersionUID = 6859680052685610986L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java
index e093a9e3a838..a5631d9e03a2 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java
@@ -49,7 +49,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6849613897967708119L;
+    private static final long serialVersionUID = -3750826541849539607L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java b/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java
index 1ec6018a8af2..bbbe07e20087 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 327877493242389369L;
+    private static final long serialVersionUID = -6997149870819705927L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java
index f1369325ce7f..4cb26d067cf9 100644
--- a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java
+++ b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java
@@ -240,5 +240,5 @@ static public java.util.Optional<LargeStruct> ice_read(com.zeroc.Ice.InputStream
     private static final LargeStruct _nullMarshalValue = new LargeStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 5926589149394462655L;
+    private static final long serialVersionUID = -7845793927056689249L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/MyClass.java b/slice2java/swift/test/Ice/stream/Test/MyClass.java
index f2306ffced10..1b8c8599220c 100644
--- a/slice2java/swift/test/Ice/stream/Test/MyClass.java
+++ b/slice2java/swift/test/Ice/stream/Test/MyClass.java
@@ -85,7 +85,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1768562470487336355L;
+    private static final long serialVersionUID = 3701656412860546669L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/stream/Test/MyException.java b/slice2java/swift/test/Ice/stream/Test/MyException.java
index df1441952fa4..db0e93502249 100644
--- a/slice2java/swift/test/Ice/stream/Test/MyException.java
+++ b/slice2java/swift/test/Ice/stream/Test/MyException.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734228504820458158L;
+    private static final long serialVersionUID = 5734228768362318148L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java
index 7fd12734aeda..9100a5c663a6 100644
--- a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java
+++ b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java
@@ -162,7 +162,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3982007243667059948L;
+    private static final long serialVersionUID = 1879291614101323133L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java
index 6bfe84cbc02f..b60b597b799d 100644
--- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java
+++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1404701861859938928L;
+    private static final long serialVersionUID = -1404701843834079054L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java
index 2f834e2db3d1..8a5b6e15bc1b 100644
--- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java
+++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java
@@ -227,5 +227,5 @@ static public java.util.Optional<NestedStruct> ice_read(com.zeroc.Ice.InputStrea
     private static final NestedStruct _nullMarshalValue = new NestedStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = -5193113253508622560L;
+    private static final long serialVersionUID = -4917039657227104112L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java
index 1f880e4ba70d..561e9b9277f2 100644
--- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java
+++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8562121922613962910L;
+    private static final long serialVersionUID = -8562121705732730624L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java
index e28a4af8cab2..f6658c7cecfe 100644
--- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java
+++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java
@@ -227,5 +227,5 @@ static public java.util.Optional<NestedStruct2> ice_read(com.zeroc.Ice.InputStre
     private static final NestedStruct2 _nullMarshalValue = new NestedStruct2();
 
     /** @hidden */
-    private static final long serialVersionUID = -4328516688457051175L;
+    private static final long serialVersionUID = 3166810659700550251L;
 }
diff --git a/slice2java/swift/test/Slice/escape/Clash/Cls.java b/slice2java/swift/test/Slice/escape/Clash/Cls.java
index adaaf2029f89..d14aca957dde 100644
--- a/slice2java/swift/test/Slice/escape/Clash/Cls.java
+++ b/slice2java/swift/test/Slice/escape/Clash/Cls.java
@@ -164,7 +164,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6710788202977663291L;
+    private static final long serialVersionUID = -7471253103940379012L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Slice/escape/Clash/Ex.java b/slice2java/swift/test/Slice/escape/Clash/Ex.java
index 2f14f63fc721..c435041ddda3 100644
--- a/slice2java/swift/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/swift/test/Slice/escape/Clash/Ex.java
@@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6692375217752623221L;
+    private static final long serialVersionUID = -7329349541635343413L;
 }
diff --git a/slice2java/swift/test/Slice/escape/Clash/St.java b/slice2java/swift/test/Slice/escape/Clash/St.java
index bfa7de483ab4..07177c18bf47 100644
--- a/slice2java/swift/test/Slice/escape/Clash/St.java
+++ b/slice2java/swift/test/Slice/escape/Clash/St.java
@@ -173,5 +173,5 @@ static public java.util.Optional<St> ice_read(com.zeroc.Ice.InputStream istr, in
     private static final St _nullMarshalValue = new St();
 
     /** @hidden */
-    private static final long serialVersionUID = -3227203907570206630L;
+    private static final long serialVersionUID = -4662580809043625542L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/_return.java b/slice2java/swift/test/Slice/escape/and/_return.java
index e563b938a269..c83516b2b04e 100644
--- a/slice2java/swift/test/Slice/escape/and/_return.java
+++ b/slice2java/swift/test/Slice/escape/and/_return.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8206178715734977648L;
+    private static final long serialVersionUID = -8206184917364160302L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/_switch.java b/slice2java/swift/test/Slice/escape/and/_switch.java
index f01c4ee9b12a..e5e2457abc65 100644
--- a/slice2java/swift/test/Slice/escape/and/_switch.java
+++ b/slice2java/swift/test/Slice/escape/and/_switch.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2666842479401235675L;
+    private static final long serialVersionUID = 7967085974404911463L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Slice/escape/and/as.java b/slice2java/swift/test/Slice/escape/and/as.java
index f18d002965cc..7bceb11354f5 100644
--- a/slice2java/swift/test/Slice/escape/and/as.java
+++ b/slice2java/swift/test/Slice/escape/and/as.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5608066058901278536L;
+    private static final long serialVersionUID = 6078087981508736568L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/defer.java b/slice2java/swift/test/Slice/escape/and/defer.java
index 45e40c7ac159..387273fa9c7c 100644
--- a/slice2java/swift/test/Slice/escape/and/defer.java
+++ b/slice2java/swift/test/Slice/escape/and/defer.java
@@ -143,5 +143,5 @@ static public java.util.Optional<defer> ice_read(com.zeroc.Ice.InputStream istr,
     private static final defer _nullMarshalValue = new defer();
 
     /** @hidden */
-    private static final long serialVersionUID = 8824790841509666968L;
+    private static final long serialVersionUID = 8824797042987056346L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/guard.java b/slice2java/swift/test/Slice/escape/and/guard.java
index 5e6684dee35e..664bd61b2446 100644
--- a/slice2java/swift/test/Slice/escape/and/guard.java
+++ b/slice2java/swift/test/Slice/escape/and/guard.java
@@ -138,5 +138,5 @@ static public java.util.Optional<guard> ice_read(com.zeroc.Ice.InputStream istr,
     private static final guard _nullMarshalValue = new guard();
 
     /** @hidden */
-    private static final long serialVersionUID = 6403709726633229478L;
+    private static final long serialVersionUID = 6403718738496712932L;
 }
diff --git a/slice2js/cpp/src/IceGrid/Internal.js b/slice2js/cpp/src/IceGrid/Internal.js
index cd7964eee83e..83cc87d8870c 100644
--- a/slice2js/cpp/src/IceGrid/Internal.js
+++ b/slice2js/cpp/src/IceGrid/Internal.js
@@ -630,8 +630,8 @@ Ice.defineOperations(
         "registerWellKnownObjects": [, 2, , , [[IceGrid.ObjectInfoSeqHelper]], , , , ],
         "setAdapterDirectProxy": [, 2, , , [[7], [7], [9]], ,
         [
-            IceGrid.AdapterExistsException,
-            IceGrid.AdapterNotExistException
+            IceGrid.AdapterNotExistException,
+            IceGrid.AdapterExistsException
         ], , ],
         "receivedUpdate": [, , , , [[IceGrid.TopicName._helper], [3], [7]], , , , ],
         "destroy": [, , , , , , , , ]
@@ -753,8 +753,8 @@ Ice.defineOperations(
         ], true, ],
         "registerReplica": [, , , ["IceGrid.ReplicaSessionPrx"], [["IceGrid.InternalReplicaInfo", true], ["IceGrid.InternalRegistryPrx"]], ,
         [
-            IceGrid.ReplicaActiveException,
-            IceGrid.PermissionDeniedException
+            IceGrid.PermissionDeniedException,
+            IceGrid.ReplicaActiveException
         ], true, ],
         "registerWithReplica": [, , , , [["IceGrid.InternalRegistryPrx"]], , , , ],
         "getNodes": [, 2, , [IceGrid.NodePrxSeqHelper], , , , , ],
diff --git a/slice2js/slice/Glacier2/Router.js b/slice2js/slice/Glacier2/Router.js
index a594f954f44a..456d58d43ddd 100644
--- a/slice2js/slice/Glacier2/Router.js
+++ b/slice2js/slice/Glacier2/Router.js
@@ -122,13 +122,13 @@ Ice.defineOperations(
         "getCategoryForClient": [, 2, , [7], , , , , ],
         "createSession": [, , , ["Glacier2.SessionPrx"], [[7], [7]], ,
         [
-            Glacier2.CannotCreateSessionException,
-            Glacier2.PermissionDeniedException
+            Glacier2.PermissionDeniedException,
+            Glacier2.CannotCreateSessionException
         ], , ],
         "createSessionFromSecureConnection": [, , , ["Glacier2.SessionPrx"], , ,
         [
-            Glacier2.CannotCreateSessionException,
-            Glacier2.PermissionDeniedException
+            Glacier2.PermissionDeniedException,
+            Glacier2.CannotCreateSessionException
         ], , ],
         "refreshSession": [, , , , , ,
         [
diff --git a/slice2js/slice/IceGrid/Admin.js b/slice2js/slice/IceGrid/Admin.js
index 61934a1aa3fc..fb7e05ddb722 100644
--- a/slice2js/slice/IceGrid/Admin.js
+++ b/slice2js/slice/IceGrid/Admin.js
@@ -421,39 +421,39 @@ Ice.defineOperations(
         ], true, ],
         "syncApplication": [, , , , [[IceGrid.ApplicationDescriptor]], ,
         [
+            IceGrid.ApplicationNotExistException,
             IceGrid.DeploymentException,
-            IceGrid.AccessDeniedException,
-            IceGrid.ApplicationNotExistException
+            IceGrid.AccessDeniedException
         ], true, ],
         "updateApplication": [, , , , [[IceGrid.ApplicationUpdateDescriptor]], ,
         [
+            IceGrid.ApplicationNotExistException,
             IceGrid.DeploymentException,
-            IceGrid.AccessDeniedException,
-            IceGrid.ApplicationNotExistException
+            IceGrid.AccessDeniedException
         ], true, ],
         "syncApplicationWithoutRestart": [, , , , [[IceGrid.ApplicationDescriptor]], ,
         [
+            IceGrid.ApplicationNotExistException,
             IceGrid.DeploymentException,
-            IceGrid.AccessDeniedException,
-            IceGrid.ApplicationNotExistException
+            IceGrid.AccessDeniedException
         ], true, ],
         "updateApplicationWithoutRestart": [, , , , [[IceGrid.ApplicationUpdateDescriptor]], ,
         [
+            IceGrid.ApplicationNotExistException,
             IceGrid.DeploymentException,
-            IceGrid.AccessDeniedException,
-            IceGrid.ApplicationNotExistException
+            IceGrid.AccessDeniedException
         ], true, ],
         "removeApplication": [, , , , [[7]], ,
         [
+            IceGrid.ApplicationNotExistException,
             IceGrid.DeploymentException,
-            IceGrid.AccessDeniedException,
-            IceGrid.ApplicationNotExistException
+            IceGrid.AccessDeniedException
         ], , ],
         "instantiateServer": [, , , , [[7], [7], [IceGrid.ServerInstanceDescriptor]], ,
         [
+            IceGrid.ApplicationNotExistException,
             IceGrid.DeploymentException,
-            IceGrid.AccessDeniedException,
-            IceGrid.ApplicationNotExistException
+            IceGrid.AccessDeniedException
         ], , ],
         "getApplicationInfo": [, 2, , [IceGrid.ApplicationInfo], [[7]], ,
         [
@@ -470,55 +470,55 @@ Ice.defineOperations(
         ], , true],
         "getServerState": [, 2, , [IceGrid.ServerState._helper], [[7]], ,
         [
+            IceGrid.ServerNotExistException,
             IceGrid.DeploymentException,
-            IceGrid.NodeUnreachableException,
-            IceGrid.ServerNotExistException
+            IceGrid.NodeUnreachableException
         ], , ],
         "getServerPid": [, 2, , [3], [[7]], ,
         [
+            IceGrid.ServerNotExistException,
             IceGrid.DeploymentException,
-            IceGrid.NodeUnreachableException,
-            IceGrid.ServerNotExistException
+            IceGrid.NodeUnreachableException
         ], , ],
         "getServerAdminCategory": [, 2, , [7], , , , , ],
         "getServerAdmin": [, 2, , [9], [[7]], ,
         [
+            IceGrid.ServerNotExistException,
             IceGrid.DeploymentException,
-            IceGrid.NodeUnreachableException,
-            IceGrid.ServerNotExistException
+            IceGrid.NodeUnreachableException
         ], , ],
         "enableServer": [, 2, , , [[7], [1]], ,
         [
+            IceGrid.ServerNotExistException,
             IceGrid.DeploymentException,
-            IceGrid.NodeUnreachableException,
-            IceGrid.ServerNotExistException
+            IceGrid.NodeUnreachableException
         ], , ],
         "isServerEnabled": [, 2, , [1], [[7]], ,
         [
+            IceGrid.ServerNotExistException,
             IceGrid.DeploymentException,
-            IceGrid.NodeUnreachableException,
-            IceGrid.ServerNotExistException
+            IceGrid.NodeUnreachableException
         ], , ],
         "startServer": [, , , , [[7]], ,
         [
+            IceGrid.ServerNotExistException,
             IceGrid.ServerStartException,
             IceGrid.DeploymentException,
-            IceGrid.NodeUnreachableException,
-            IceGrid.ServerNotExistException
+            IceGrid.NodeUnreachableException
         ], , ],
         "stopServer": [, , , , [[7]], ,
         [
+            IceGrid.ServerNotExistException,
             IceGrid.ServerStopException,
             IceGrid.DeploymentException,
-            IceGrid.NodeUnreachableException,
-            IceGrid.ServerNotExistException
+            IceGrid.NodeUnreachableException
         ], , ],
         "sendSignal": [, , , , [[7], [7]], ,
         [
+            IceGrid.ServerNotExistException,
             IceGrid.DeploymentException,
             IceGrid.NodeUnreachableException,
-            IceGrid.BadSignalException,
-            IceGrid.ServerNotExistException
+            IceGrid.BadSignalException
         ], , ],
         "getAllServerIds": [, 2, , [Ice.StringSeqHelper], , , , , ],
         "getAdapterInfo": [, 2, , [IceGrid.AdapterInfoSeqHelper], [[7]], ,
@@ -985,24 +985,24 @@ Ice.defineOperations(
         "getReplicaName": [, 2, , [7], , , , , ],
         "openServerLog": [, , , ["IceGrid.FileIteratorPrx"], [[7], [7], [3]], ,
         [
+            IceGrid.ServerNotExistException,
             IceGrid.DeploymentException,
             IceGrid.NodeUnreachableException,
-            IceGrid.FileNotAvailableException,
-            IceGrid.ServerNotExistException
+            IceGrid.FileNotAvailableException
         ], , ],
         "openServerStdErr": [, , , ["IceGrid.FileIteratorPrx"], [[7], [3]], ,
         [
+            IceGrid.ServerNotExistException,
             IceGrid.DeploymentException,
             IceGrid.NodeUnreachableException,
-            IceGrid.FileNotAvailableException,
-            IceGrid.ServerNotExistException
+            IceGrid.FileNotAvailableException
         ], , ],
         "openServerStdOut": [, , , ["IceGrid.FileIteratorPrx"], [[7], [3]], ,
         [
+            IceGrid.ServerNotExistException,
             IceGrid.DeploymentException,
             IceGrid.NodeUnreachableException,
-            IceGrid.FileNotAvailableException,
-            IceGrid.ServerNotExistException
+            IceGrid.FileNotAvailableException
         ], , ],
         "openNodeStdErr": [, , , ["IceGrid.FileIteratorPrx"], [[7], [3]], ,
         [