diff --git a/slice2cpp/cpp/src/IceGrid/Internal.cpp b/slice2cpp/cpp/src/IceGrid/Internal.cpp
index 82351e411fce..fbbb287a5095 100644
--- a/slice2cpp/cpp/src/IceGrid/Internal.cpp
+++ b/slice2cpp/cpp/src/IceGrid/Internal.cpp
@@ -1585,11 +1585,11 @@ IceGrid::ReplicaSessionPrx::_iceI_setAdapterDirectProxy(const ::std::shared_ptr<
             {
                 ex.ice_throw();
             }
-            catch(const AdapterExistsException&)
+            catch(const AdapterNotExistException&)
             {
                 throw;
             }
-            catch(const AdapterNotExistException&)
+            catch(const AdapterExistsException&)
             {
                 throw;
             }
@@ -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;
             }
diff --git a/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.cpp b/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.cpp
index 96fe1ac2d6e5..43ed1cc218a7 100644
--- a/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.cpp
+++ b/slice2cpp/java/test/src/main/java/test/Ice/exceptions/Test.cpp
@@ -217,11 +217,11 @@ Test::ThrowerPrx::_iceI_throwAorDasAorD(const ::std::shared_ptr<::IceInternal::O
             {
                 ex.ice_throw();
             }
-            catch(const D&)
+            catch(const A&)
             {
                 throw;
             }
-            catch(const A&)
+            catch(const D&)
             {
                 throw;
             }
diff --git a/slice2cpp/slice/Glacier2/Router.cpp b/slice2cpp/slice/Glacier2/Router.cpp
index 1d340fbe3855..b78e54e2c039 100644
--- a/slice2cpp/slice/Glacier2/Router.cpp
+++ b/slice2cpp/slice/Glacier2/Router.cpp
@@ -109,11 +109,11 @@ Glacier2::RouterPrx::_iceI_createSession(const ::std::shared_ptr<::IceInternal::
             {
                 ex.ice_throw();
             }
-            catch(const PermissionDeniedException&)
+            catch(const CannotCreateSessionException&)
             {
                 throw;
             }
-            catch(const CannotCreateSessionException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
@@ -155,11 +155,11 @@ Glacier2::RouterPrx::_iceI_createSessionFromSecureConnection(const ::std::shared
             {
                 ex.ice_throw();
             }
-            catch(const PermissionDeniedException&)
+            catch(const CannotCreateSessionException&)
             {
                 throw;
             }
-            catch(const CannotCreateSessionException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
diff --git a/slice2cs/cpp/src/IceGrid/Internal.cs b/slice2cs/cpp/src/IceGrid/Internal.cs
index b67900ade6ad..6e1bc9305236 100644
--- a/slice2cs/cpp/src/IceGrid/Internal.cs
+++ b/slice2cs/cpp/src/IceGrid/Internal.cs
@@ -6415,16 +6415,16 @@ public abstract class NodeDisp_ : Ice.ObjectImpl, Node
 
         public abstract void shutdown(Ice.Current current);
 
-        public abstract long getOffsetFromEnd(string filename, int lines, Ice.Current current);
-
-        public abstract bool read(string filename, long pos, int size, out long newPos, out string[] lines, Ice.Current current);
-
         public abstract void replicaInit(InternalRegistryPrx?[] replicas, Ice.Current current);
 
         public abstract void replicaAdded(InternalRegistryPrx? replica, Ice.Current current);
 
         public abstract void replicaRemoved(InternalRegistryPrx? replica, Ice.Current current);
 
+        public abstract long getOffsetFromEnd(string filename, int lines, Ice.Current current);
+
+        public abstract bool read(string filename, long pos, int size, out long newPos, out string[] lines, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::IceGrid::Node";
diff --git a/slice2cs/cpp/test/Ice/operations/Test.cs b/slice2cs/cpp/test/Ice/operations/Test.cs
index 6c3c2d37b9f5..ae9e51d2ddeb 100644
--- a/slice2cs/cpp/test/Ice/operations/Test.cs
+++ b/slice2cs/cpp/test/Ice/operations/Test.cs
@@ -13606,26 +13606,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);
@@ -13650,6 +13630,26 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out 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);
+
+        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 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);
@@ -13839,26 +13839,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);
@@ -13883,6 +13863,26 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out 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);
+
+        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::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);
diff --git a/slice2cs/csharp/test/Ice/inheritance/Test.cs b/slice2cs/csharp/test/Ice/inheritance/Test.cs
index 11804ceaf354..54bfacc4b029 100644
--- a/slice2cs/csharp/test/Ice/inheritance/Test.cs
+++ b/slice2cs/csharp/test/Ice/inheritance/Test.cs
@@ -1139,12 +1139,12 @@ public abstract class ICDisp_ : Ice.ObjectImpl, IC
             {
                 public abstract ICPrx? icop(ICPrx? p, Ice.Current current);
 
+                public abstract global::Ice.inheritance.Test.MB.IB2Prx? ib2op(global::Ice.inheritance.Test.MB.IB2Prx? p, Ice.Current current);
+
                 public abstract IAPrx? iaop(IAPrx? p, Ice.Current current);
 
                 public abstract global::Ice.inheritance.Test.MB.IB1Prx? ib1op(global::Ice.inheritance.Test.MB.IB1Prx? p, Ice.Current current);
 
-                public abstract global::Ice.inheritance.Test.MB.IB2Prx? ib2op(global::Ice.inheritance.Test.MB.IB2Prx? p, Ice.Current current);
-
                 public override string ice_id(Ice.Current current) => ice_staticId();
 
                 public static new string ice_staticId() => "::Test::MA::IC";
diff --git a/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs
index be8982f76126..0cbb9904c9c7 100644
--- a/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs
+++ b/slice2cs/java/test/src/main/java/test/Ice/operations/Test.cs
@@ -13408,32 +13408,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);
@@ -13548,6 +13522,32 @@ 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 override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -13641,32 +13641,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);
@@ -13781,6 +13755,32 @@ 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 override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";
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..628d497b145c 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
@@ -9914,6 +9914,22 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpByteBoolDSResult> opByteBoolDSAsync(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] 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_OpMStruct1MarshaledResult> opMStruct1Async(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct2MarshaledResult> opMStruct2Async(Structure p1, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq1MarshaledResult> opMSeq1Async(Ice.Current current);
+
+        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 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);
@@ -9932,10 +9948,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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);
@@ -9982,18 +9994,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct2MarshaledResult> opMStruct2Async(Structure p1, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq1MarshaledResult> opMSeq1Async(Ice.Current current);
-
-        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/js/test/Ice/operations/Test.cs b/slice2cs/js/test/Ice/operations/Test.cs
index a93e17d98fd3..e4cbd8ad8ce9 100644
--- a/slice2cs/js/test/Ice/operations/Test.cs
+++ b/slice2cs/js/test/Ice/operations/Test.cs
@@ -13744,6 +13744,38 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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);
+
+        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);
@@ -13810,38 +13842,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 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);
-
-        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 override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -14009,6 +14009,38 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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);
+
+        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);
@@ -14075,38 +14107,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 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);
-
-        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 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 806f43dde3ad..bcccf3804884 100644
--- a/slice2cs/php/test/Ice/operations/Test.cs
+++ b/slice2cs/php/test/Ice/operations/Test.cs
@@ -12220,6 +12220,12 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyClass1? opMyClass1(MyClass1? c, 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);
@@ -12340,12 +12346,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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 override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -12432,6 +12432,12 @@ namespace Test2
 {
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
+        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);
@@ -12552,12 +12558,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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 override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";
diff --git a/slice2cs/php/test/Slice/escape/Key.cs b/slice2cs/php/test/Slice/escape/Key.cs
index cf1590a3cdd4..2ce2e7c8ee87 100644
--- a/slice2cs/php/test/Slice/escape/Key.cs
+++ b/slice2cs/php/test/Slice/escape/Key.cs
@@ -983,10 +983,10 @@ public abstract class dieDisp_ : Ice.ObjectImpl, die
 
     public abstract class enddeclareDisp_ : Ice.ObjectImpl, enddeclare
     {
-        public abstract void @continue(int declare, int @default, Ice.Current current);
-
         public abstract void @do(Ice.Current current);
 
+        public abstract void @continue(int declare, int @default, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::and::enddeclare";
diff --git a/slice2cs/python/test/Ice/operations/Test.cs b/slice2cs/python/test/Ice/operations/Test.cs
index a5ab7850a02f..2ff1123f3769 100644
--- a/slice2cs/python/test/Ice/operations/Test.cs
+++ b/slice2cs/python/test/Ice/operations/Test.cs
@@ -13375,8 +13375,44 @@ 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);
@@ -13399,16 +13435,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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<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);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string[]> opStringStringSD(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<MyEnum, MyEnum[]> opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p1, global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p2, out global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p3, Ice.Current current);
-
-        public abstract int[] opIntS(int[] s, 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);
@@ -13431,10 +13457,24 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string[]> opStringStringSD(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<MyEnum, MyEnum[]> opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p1, global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p2, out global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p3, Ice.Current current);
+
+        public abstract int[] opIntS(int[] s, Ice.Current current);
+
         public abstract void opByteSOneway(byte[] s, Ice.Current current);
 
         public abstract int opByteSOnewayCallCount(Ice.Current current);
 
+        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);
@@ -13473,46 +13513,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
 
-        public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opContext(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 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 MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
         public override string ice_id(Ice.Current current) => ice_staticId();
@@ -13608,8 +13608,44 @@ 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);
@@ -13632,16 +13668,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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<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);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string[]> opStringStringSD(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<global::Test.MyEnum, global::Test.MyEnum[]> opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, global::Test.MyEnum[]> p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, global::Test.MyEnum[]> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, global::Test.MyEnum[]> p3, Ice.Current current);
-
-        public abstract int[] opIntS(int[] s, 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);
@@ -13664,10 +13690,24 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string[]> opStringStringSD(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<global::Test.MyEnum, global::Test.MyEnum[]> opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, global::Test.MyEnum[]> p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, global::Test.MyEnum[]> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, global::Test.MyEnum[]> p3, Ice.Current current);
+
+        public abstract int[] opIntS(int[] s, Ice.Current current);
+
         public abstract void opByteSOneway(byte[] s, Ice.Current current);
 
         public abstract int opByteSOnewayCallCount(Ice.Current current);
 
+        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);
@@ -13706,46 +13746,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
 
-        public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opContext(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 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 global::Test.MyClass_OpMDict2MarshaledResult opMDict2(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/ruby/test/Ice/operations/Test.cs b/slice2cs/ruby/test/Ice/operations/Test.cs
index a4ec73b2fc90..21117d3826eb 100644
--- a/slice2cs/ruby/test/Ice/operations/Test.cs
+++ b/slice2cs/ruby/test/Ice/operations/Test.cs
@@ -13118,10 +13118,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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, 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<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);
@@ -13134,6 +13130,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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);
@@ -13345,10 +13345,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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, 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<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);
@@ -13361,6 +13357,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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);
diff --git a/slice2cs/swift/test/Ice/operations/Test.cs b/slice2cs/swift/test/Ice/operations/Test.cs
index 6c3c2d37b9f5..2007fc8e13f9 100644
--- a/slice2cs/swift/test/Ice/operations/Test.cs
+++ b/slice2cs/swift/test/Ice/operations/Test.cs
@@ -13606,58 +13606,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);
-
         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);
@@ -13746,6 +13694,58 @@ 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 override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -13839,58 +13839,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);
-
         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);
@@ -13979,6 +13927,58 @@ 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 override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java
index 6dc875e74670..dcc8642d651a 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 = 3774323271418661698L;
+    private static final long serialVersionUID = 3774323374830493813L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java
index 4b83f6e6e571..d749e8300eb7 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 = 7872709738531393304L;
+    private static final long serialVersionUID = 7872709836675167667L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java
index 02e99163b442..39b936773291 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 = 7471736229755664469L;
+    private static final long serialVersionUID = 2779769557518912649L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java
index cd8e7c01b356..f7af2b23c650 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 = 541098983656730141L;
+    private static final long serialVersionUID = 6842619419816202675L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
index 4749e1f59154..eb7a2de6c8a7 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
@@ -100,7 +100,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6848161327459758756L;
+    private static final long serialVersionUID = -4602374433040664316L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java
index 7ef312c7d53b..9215ce683d19 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 = 6952764752407238332L;
+    private static final long serialVersionUID = 6506095946707403004L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java
index 25fc111fc0fa..0b8550540518 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 = 7005687974795997054L;
+    private static final long serialVersionUID = -5581600071508740105L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java
index 100bfd8f0658..22eed922335f 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 = 7538363381509241012L;
+    private static final long serialVersionUID = -9060623992531347916L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java
index f6457339229e..a6a070779589 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 = 6366024965508524964L;
+    private static final long serialVersionUID = -5302168359654645793L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java
index 31240c09e7ad..0278e87ac9e8 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 = 2820958215552699094L;
+    private static final long serialVersionUID = -2289842147930426722L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java
index bc116db87044..673678024e9b 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 = 4223402060488252087L;
+    private static final long serialVersionUID = -8539455292509288154L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java
index e67b5d6bee01..bd602557f2ae 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 = -3940891068364312417L;
+    private static final long serialVersionUID = 5728582344499570911L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java
index 137396d41374..5e81c8b410fa 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 = 751994440747610922L;
+    private static final long serialVersionUID = 719528517757080879L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java
index 935c253e93fd..3624e4622f85 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 = 9134431515426322756L;
+    private static final long serialVersionUID = 3408690124844510020L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java
index 6118072fbec1..7ef74ddbac49 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 = -235252831877895085L;
+    private static final long serialVersionUID = 3056939385837255728L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java
index fb97e112579b..39146d6dffda 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 = 938915086363294623L;
+    private static final long serialVersionUID = 938912444012924243L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java
index 81021d7b0154..00517aacc1e8 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 = 3935115242097530626L;
+    private static final long serialVersionUID = 1464307718833947489L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java
index e3c455e6dda6..083a31218c5b 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 = 4061819242479132635L;
+    private static final long serialVersionUID = -3450181061931040608L;
 }
diff --git a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java
index 4c3f089b9a05..253e47ecc21d 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 = -4836583165536106839L;
+    private static final long serialVersionUID = 3997688657518411018L;
 }
diff --git a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java
index 52822bc238ca..6b7c5ca5aff8 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 = 7208832238151642532L;
+    private static final long serialVersionUID = 6408226773676220260L;
 }
diff --git a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java
index 02e1cbf6a6ba..479ed8294f94 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 = -2795038347990803793L;
+    private static final long serialVersionUID = 6496081792630754351L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java
index 052b7615238c..6db29eae5871 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 = -1998609097891195616L;
+    private static final long serialVersionUID = -2403171201859821388L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/DictClass.java b/slice2java/cpp/test/Ice/custom/Test/DictClass.java
index 9599b2643e61..618f3008efc3 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 = 6545917322783817377L;
+    private static final long serialVersionUID = 6545922296304328629L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/custom/Test/Fixed.java b/slice2java/cpp/test/Ice/custom/Test/Fixed.java
index 05181f96aca8..6eedbe37f5e0 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 = -5072326093005605904L;
+    private static final long serialVersionUID = -5072319835920101148L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/Variable.java b/slice2java/cpp/test/Ice/custom/Test/Variable.java
index c4b48aa9265a..839e9a47510a 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 = -3670044833479940608L;
+    private static final long serialVersionUID = -152077814651939180L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java
index db7b1d9ad885..1e7c26819e63 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 = 1345711952909713678L;
+    private static final long serialVersionUID = 1345709979700679317L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java
index 1cd72310bd8e..75625a8b4520 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 = -6616024451229885223L;
+    private static final long serialVersionUID = -6616022478039824574L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java
index 0b4043ba9fd2..6bb3c613af54 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 = 4583031070643449997L;
+    private static final long serialVersionUID = 4583029270325251222L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java
index 51af62f17908..3ab93a1ee8ae 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 = 5997333830004115418L;
+    private static final long serialVersionUID = 5997335630303340481L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java
index cf7bd9184b4c..9cffb800797f 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 = -7895301157009827289L;
+    private static final long serialVersionUID = 8419029344730482631L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java
index 872055b1bff8..072cc835506c 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 = -9019892007646210861L;
+    private static final long serialVersionUID = -6497849471924853133L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java
index 81ba5a22103a..f9bde1d190b6 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 = 5068808695707294229L;
+    private static final long serialVersionUID = -2275853418614395435L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java
index a17d1e142576..f35a3d196a94 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 = -8563865509696238942L;
+    private static final long serialVersionUID = -4416833840441713054L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java
index 7a7a259fc198..040ee91b86dc 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 = -7813668994029941486L;
+    private static final long serialVersionUID = 7072307613348345746L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java
index 5f984f990280..e5a75a8181dc 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 = -4273478208751292814L;
+    private static final long serialVersionUID = 7149024149256947602L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java
index 3b10af91db6d..5a8635bcfb1f 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 = -6909289474811173872L;
+    private static final long serialVersionUID = 8550151120907020688L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/A.java b/slice2java/cpp/test/Ice/exceptions/Test/A.java
index 2bb7d62c1bef..2897e479de1d 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 = 7823737045118268807L;
+    private static final long serialVersionUID = 7823745291226824482L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/B.java b/slice2java/cpp/test/Ice/exceptions/Test/B.java
index 7b123997faa6..415764df0446 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 = -3861418853393886009L;
+    private static final long serialVersionUID = -3861410607285330334L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/C.java b/slice2java/cpp/test/Ice/exceptions/Test/C.java
index f140dc5e2516..c0301d59aa3f 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 = 1080690736321054087L;
+    private static final long serialVersionUID = 1080698982429609762L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/D.java b/slice2java/cpp/test/Ice/exceptions/Test/D.java
index 0e29cc5151c1..3d172402faae 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 = 4780373414708192199L;
+    private static final long serialVersionUID = 4780381660816747874L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/E.java b/slice2java/cpp/test/Ice/exceptions/Test/E.java
index bb0b7013e475..d59090b58234 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 = -1876976332254230342L;
+    private static final long serialVersionUID = -1876968081134249823L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/F.java b/slice2java/cpp/test/Ice/exceptions/Test/F.java
index a5379c80910b..287bad1dabdd 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 = 733472762628462969L;
+    private static final long serialVersionUID = 733475390853587554L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java
index 8c9906ed0966..fc5db189d481 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 = -4641410909915346157L;
+    private static final long serialVersionUID = -4641413563815144778L;
 }
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java
index 19103eb336b0..5c71ced726bb 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 = 954230185636408863L;
+    private static final long serialVersionUID = 954232959861260349L;
 
     /** @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 5b2cdcbbbf33..fdeb7f97ad10 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 = 1339643360590750469L;
+    private static final long serialVersionUID = 1339629929475535655L;
 
     /** @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 e51bb38fe69d..72bd8a85f640 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 = -2729307670870828665L;
+    private static final long serialVersionUID = -2729304896645977179L;
 
     /** @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 2fb3ea956fd6..aa6294963fd6 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 = -3435399729330502143L;
+    private static final long serialVersionUID = -3435402250133514717L;
 
     /** @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 098f8132ae8d..8b78106f5be0 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 = -836186072705147624L;
+    private static final long serialVersionUID = -836177770997240454L;
 
     /** @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 aba337e4f5dd..6bc1d9a76a5f 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 = 1132526873395602725L;
+    private static final long serialVersionUID = 1132524181985699143L;
 
     /** @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 7116a04d9193..8785a2adf31c 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 = -6335550887898541401L;
+    private static final long serialVersionUID = -6335559194611182907L;
 
     /** @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 b100921a2195..8f6e4694f22f 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 = -4007416720144189663L;
+    private static final long serialVersionUID = -4007408501241891005L;
 
     /** @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 ce60566d3f6a..e70b8cc3cf79 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 = 991429148459745945L;
+    private static final long serialVersionUID = 991426627656733371L;
 
     /** @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 72c57748b371..a61f4dce18e7 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 = -2880330041395162299L;
+    private static final long serialVersionUID = -2880332562492570777L;
 
     /** @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 d86fa33d2b6e..663527872bdc 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 = -8808263377928762681L;
+    private static final long serialVersionUID = -8808271514328909083L;
 
     /** @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 3a3d2038a794..57fbc19b60e6 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 = -771859930758969535L;
+    private static final long serialVersionUID = -771851541544175773L;
 
     /** @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 b8d766ad27db..1edec803196e 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 = 6566349813597905818L;
+    private static final long serialVersionUID = 6566352500003075064L;
 
     /** @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 8efb024ca7c2..b34b5ead4c8c 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 = 6983809243381060197L;
+    private static final long serialVersionUID = 6983795641649754247L;
 
     /** @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 106c88c23270..5b36461613ec 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 = -1175220522598177817L;
+    private static final long serialVersionUID = -1175217918989417467L;
 
     /** @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 8fd50a07f6fc..0a367560bd3a 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 = -3279719563175708831L;
+    private static final long serialVersionUID = -3279722254594812541L;
 
     /** @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 66cf78f74207..5b494d6a9300 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 = -4359182135077861605L;
+    private static final long serialVersionUID = -4359168450540807879L;
 
     /** @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 f6c8093fb5e7..054026e65a3f 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 = 5904700148142138501L;
+    private static final long serialVersionUID = 5904686717026923687L;
 
     /** @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 affaaba13c11..f979e59357b8 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 = 1835749116680559367L;
+    private static final long serialVersionUID = 1835751890905410853L;
 
     /** @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 1d73b1d9552a..ff10bc5327aa 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 = -2252400382560819327L;
+    private static final long serialVersionUID = -2252402903363831901L;
 
     /** @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 47af0ef39bd7..0069623d0ad9 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 = -1203533595037426156L;
+    private static final long serialVersionUID = -1203536203641721226L;
 
     /** @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 8ad1d6eab8a0..19505396388a 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 = -7537765158191682395L;
+    private static final long serialVersionUID = -7537767849601585977L;
 
     /** @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 94f2fd884d8c..301d62d5fdfa 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 = 3440901154223725095L;
+    private static final long serialVersionUID = 3440892847511083589L;
 
     /** @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 bb7274d724d5..953d26267083 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 = 9151092762759782049L;
+    private static final long serialVersionUID = 9151100981662080707L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/library/Test/UserError.java b/slice2java/cpp/test/Ice/library/Test/UserError.java
index 1bcabfcdf6bd..314c24c1d682 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 = -1126963350029426791L;
+    private static final long serialVersionUID = -1126954500909737899L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/A.java b/slice2java/cpp/test/Ice/objects/Test/A.java
index 2fa029795eb6..3ccee5fc5e6e 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 = 4505493537537163349L;
+    private static final long serialVersionUID = 614404643891906086L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/A1.java b/slice2java/cpp/test/Ice/objects/Test/A1.java
index 2d633cd79376..cfeafc0e8c06 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 = -5926739142761621223L;
+    private static final long serialVersionUID = -5926752199514328461L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/B.java b/slice2java/cpp/test/Ice/objects/Test/B.java
index e16065831d6d..a90414431d5d 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 = -8890911513468301298L;
+    private static final long serialVersionUID = -8890917952741385703L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/B1.java b/slice2java/cpp/test/Ice/objects/Test/B1.java
index cf0876cf5c25..396323151bf0 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 = -7057988718846815868L;
+    private static final long serialVersionUID = 4748767072949361668L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Base.java b/slice2java/cpp/test/Ice/objects/Test/Base.java
index d99b8ad8cb49..b40f3f4a40b9 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 = 2001155675454377573L;
+    private static final long serialVersionUID = 1313926537190326528L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java
index 1c61a6671f40..99ef2e136910 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 = 3897775851942488395L;
+    private static final long serialVersionUID = 3897764122817729185L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/C.java b/slice2java/cpp/test/Ice/objects/Test/C.java
index f9be79e7a803..8c49eb04338e 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 = -6880890664584634657L;
+    private static final long serialVersionUID = 8648595364743154331L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/COneMember.java b/slice2java/cpp/test/Ice/objects/Test/COneMember.java
index 9672bed30a51..83a16c86f93c 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 = 3050964909246322822L;
+    private static final long serialVersionUID = 3050971183352553505L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java
index 71680bec7b79..33f3da17f8bb 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 = 917664198692411291L;
+    private static final long serialVersionUID = 3354890112082764955L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/D.java b/slice2java/cpp/test/Ice/objects/Test/D.java
index 408b3a0927a9..f1f8f215b70e 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 = -3541467236731734337L;
+    private static final long serialVersionUID = 2830677483826171259L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/D1.java b/slice2java/cpp/test/Ice/objects/Test/D1.java
index cfca34aec5b6..3146ebf7bbb2 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 = 5203072158277471555L;
+    private static final long serialVersionUID = -6229745504460627645L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Derived.java b/slice2java/cpp/test/Ice/objects/Test/Derived.java
index ac8258871419..d3850be886d6 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 = -1587922584468167684L;
+    private static final long serialVersionUID = -1587922505788057792L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/E.java b/slice2java/cpp/test/Ice/objects/Test/E.java
index 98b86e8fd014..d5c6c3718e64 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 = -1246637844679327305L;
+    private static final long serialVersionUID = -6041765406904753365L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/EBase.java b/slice2java/cpp/test/Ice/objects/Test/EBase.java
index dc04350ba642..d54b6c4b5cce 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 = -9132531629250283186L;
+    private static final long serialVersionUID = -6376621228364931122L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/EDerived.java b/slice2java/cpp/test/Ice/objects/Test/EDerived.java
index 926d0482544c..e71f72ef1088 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 = -4958241841965861934L;
+    private static final long serialVersionUID = -599147767279190062L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java
index a1b6447d14ad..8d9ea53bf754 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 = -6225280052737702903L;
+    private static final long serialVersionUID = -6225293104464489362L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java
index 4b5f79bfaea2..a02dfcfcbbb1 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 = -4712776886235864684L;
+    private static final long serialVersionUID = -3740043143968270316L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/F.java b/slice2java/cpp/test/Ice/objects/Test/F.java
index 4d1a8e064323..e1b2908e3e74 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 = 1156431186348581713L;
+    private static final long serialVersionUID = -7482788688808854959L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/F1.java b/slice2java/cpp/test/Ice/objects/Test/F1.java
index ca023a4890bf..ac1d21a7a703 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 = 6192369415493269626L;
+    private static final long serialVersionUID = 6192369112062662768L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/F3.java b/slice2java/cpp/test/Ice/objects/Test/F3.java
index deb6da0d24dc..07b34b5b2335 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 = 3925799109788715992L;
+    private static final long serialVersionUID = 4025416673422231714L;
 
     /** @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 9cbe059d96c9..71152e2ca97d 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 = -1425254135505490908L;
+    private static final long serialVersionUID = -1425265869787896013L;
 
     /** @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 f6b522acaa80..3982cbc9971f 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 = -2337224940450828384L;
+    private static final long serialVersionUID = -2337234029814406326L;
 }
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 5162923ca565..af50746b2fdd 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 = -1298689060229535982L;
+    private static final long serialVersionUID = -1298683943424123131L;
 
     /** @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 8ea601dbf618..2e3153cb44d0 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 = 1842225998353413444L;
+    private static final long serialVersionUID = 1842233594774817262L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/K.java b/slice2java/cpp/test/Ice/objects/Test/K.java
index 84765c61be44..1ff6e88b5ebd 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 = 4645160553766961202L;
+    private static final long serialVersionUID = 4645167990036649573L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/L.java b/slice2java/cpp/test/Ice/objects/Test/L.java
index 9c94a3610ef4..982ae9e32e1c 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 = 6629743539727613266L;
+    private static final long serialVersionUID = 6629743878085632248L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/M.java b/slice2java/cpp/test/Ice/objects/Test/M.java
index ac7ee44aa998..9f9dd2565c20 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 = -8088101662672250231L;
+    private static final long serialVersionUID = -8088097868330049620L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Recursive.java b/slice2java/cpp/test/Ice/objects/Test/Recursive.java
index d50cdacf85d2..3e659858b326 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 = 3617887549183046970L;
+    private static final long serialVersionUID = 3617883754845217608L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/S.java b/slice2java/cpp/test/Ice/objects/Test/S.java
index 9c075bedbc74..f6a6d3bed0c4 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 = 481773383260956513L;
+    private static final long serialVersionUID = 481772559297045451L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java
index 2ebfe8a14453..f04948322291 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 = 6227748923630614943L;
+    private static final long serialVersionUID = 6227754040575623544L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java
index 07d81fca426e..2c3c4e42af8f 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 = 7082645446658789634L;
+    private static final long serialVersionUID = 6381881284452626306L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/StructKey.java b/slice2java/cpp/test/Ice/objects/Test/StructKey.java
index 77a0cc33ab4d..7a8d9011a5ae 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 = 9214768366549449595L;
+    private static final long serialVersionUID = -6205767147048183449L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java
index f904bc08799c..f15024d45857 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 = 2723843561669556963L;
+    private static final long serialVersionUID = 2723850418149754999L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java
index 856828f0b43f..6ab8e454bb43 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 = -5675586688441989751L;
+    private static final long serialVersionUID = 390966060903326365L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java
index e4a5d713324b..7bc0d8dba143 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 = -6914172243194081827L;
+    private static final long serialVersionUID = -5973837379525216451L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java
index 00cf9004d436..2b89873c182e 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 = -2508630480266399872L;
+    private static final long serialVersionUID = -5877906788823341164L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/Structure.java b/slice2java/cpp/test/Ice/operations/Test/Structure.java
index 78b7036796f7..b9f7a06cf16f 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 = 3580504793813089113L;
+    private static final long serialVersionUID = 1417262984918842586L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/A.java b/slice2java/cpp/test/Ice/optional/Test/A.java
index 1421277d32f4..31c8f0396a63 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 = 6733535504517295504L;
+    private static final long serialVersionUID = 5468361172488047888L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/B.java b/slice2java/cpp/test/Ice/optional/Test/B.java
index cd6d1642eb1c..7b046f889411 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 = 5662194164637535459L;
+    private static final long serialVersionUID = -8668818403573924765L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/C.java b/slice2java/cpp/test/Ice/optional/Test/C.java
index 0afd98739114..6796ee572c1e 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 = 4089072353927499965L;
+    private static final long serialVersionUID = 1651883806197357501L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java
index 3efc80270446..ef8ac0b1d2f4 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 = 4526599740352446384L;
+    private static final long serialVersionUID = 748928349629016544L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/E.java b/slice2java/cpp/test/Ice/optional/Test/E.java
index 407ebfd5b713..98280ecc0722 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 = -1850732592254662461L;
+    private static final long serialVersionUID = -1850739598282027245L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/F.java b/slice2java/cpp/test/Ice/optional/Test/F.java
index 93ad3896b3dd..4288d85963b0 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 = -6430494242752301648L;
+    private static final long serialVersionUID = -6430492691885637920L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java
index 12950b20d4f0..0d2bec040dff 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 = 1569613690737285360L;
+    private static final long serialVersionUID = 1569601355850744608L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/G.java b/slice2java/cpp/test/Ice/optional/Test/G.java
index 6f8e49fbc16c..9c754897db06 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 = -7860335889213296173L;
+    private static final long serialVersionUID = 6291834316520483283L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/G1.java b/slice2java/cpp/test/Ice/optional/Test/G1.java
index 8f88507d8e59..2fdf092ce35d 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 = 7339783207327380222L;
+    private static final long serialVersionUID = 7339784632008599342L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/G2.java b/slice2java/cpp/test/Ice/optional/Test/G2.java
index e63c76a1abd7..7e6b652101f2 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 = 3824558021087308059L;
+    private static final long serialVersionUID = 3824551015065625803L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java
index 716172d3837b..c908a18dd275 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 = 718040363592655769L;
+    private static final long serialVersionUID = 8719065592702837449L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java
index 777af3ef9776..a41523d2e648 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 = -7219608722614741602L;
+    private static final long serialVersionUID = -7219599071550577842L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java
index db98e25689b7..94e85b611eb3 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 = 6534461980057921590L;
+    private static final long serialVersionUID = -797332510138517146L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java
index 77debed9bbe2..a6a49525d89b 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 = 6970536824405652091L;
+    private static final long serialVersionUID = 1449982636742599035L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java
index c3af80c313c9..be41036aa204 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 = 2894245416111375479L;
+    private static final long serialVersionUID = 2894238740401897255L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java
index c02f2c4f7a91..e2035e383da3 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 = 6700991951224770216L;
+    private static final long serialVersionUID = 6700987716425224696L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java
index ae3ab28649dd..9906986234e9 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 = -1912285660256781194L;
+    private static final long serialVersionUID = -1912284235575562074L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/WD.java b/slice2java/cpp/test/Ice/optional/Test/WD.java
index 5aed9955869a..33a071e907cc 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 = -8116900483388865952L;
+    private static final long serialVersionUID = -7941204252243438880L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C.java b/slice2java/cpp/test/Ice/scope/Test/C.java
index bd569faa290f..0e70f223ea73 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 = -5190248733181807666L;
+    private static final long serialVersionUID = -5190250257114433560L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C1.java b/slice2java/cpp/test/Ice/scope/Test/C1.java
index 0d20e1f51a46..8d228a2a6ef0 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 = 8893234470287104745L;
+    private static final long serialVersionUID = 8893230389096233039L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C2.java b/slice2java/cpp/test/Ice/scope/Test/C2.java
index 4bdb82ef8398..bda22a4eca48 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 = 7421302042634316612L;
+    private static final long serialVersionUID = 6328425151047862178L;
 
     /** @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 a241ae5b8787..c36766d3d54d 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 = 4615627028148960570L;
+    private static final long serialVersionUID = 4615625659045854940L;
 
     /** @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 5fa2c30dabfc..6df70ec81c5a 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 = 672592871677094585L;
+    private static final long serialVersionUID = 672580602579443295L;
 
     /** @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 5ba6d605ad3a..717175578019 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 = 8654438164418709847L;
+    private static final long serialVersionUID = 8654442245462244209L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java
index 27f1530f8773..b654513af7fe 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 = 3694620146117462811L;
+    private static final long serialVersionUID = 3694612996555521341L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S.java b/slice2java/cpp/test/Ice/scope/Test/S.java
index 15163b91a3d6..8fe6d66f6687 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 = 2159701303753543013L;
+    private static final long serialVersionUID = 2159705560427233795L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S1.java b/slice2java/cpp/test/Ice/scope/Test/S1.java
index 9700bade27dc..a876e6168bcc 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 = 1241678754560363344L;
+    private static final long serialVersionUID = 1241672111244099702L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S2.java b/slice2java/cpp/test/Ice/scope/Test/S2.java
index 4021b8bb7492..b741c85d11c7 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 = 7985903393279219645L;
+    private static final long serialVersionUID = 7684073786785975643L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java
index ef4c78cb8a02..f878c6047f30 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 = -477024225550117675L;
+    private static final long serialVersionUID = -477023884604309352L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 402442fc622b..d95bd14d6a58 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 = 3485213999900559987L;
+    private static final long serialVersionUID = 3485214340846494782L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 31cf9c1870f1..db8e033b0fa8 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 = 1717377821895404674L;
+    private static final long serialVersionUID = 1717378162844682959L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 370e8a3e7e88..fd74782fe0df 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 = -7384918138091819301L;
+    private static final long serialVersionUID = -7384918479036366954L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index d0fa04eb5df6..55cee777d836 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 = 3424370115207581623L;
+    private static final long serialVersionUID = 3424380267352117475L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index fc70dffef6de..a2521f85ae73 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 = -1172598577826362842L;
+    private static final long serialVersionUID = -1172597974644052366L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 22f667db730f..7cccc0035705 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 = -1126113987027392033L;
+    private static final long serialVersionUID = -1126109290043557493L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index 3868a1bdc39e..7f89642c193a 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 = -2097583622210094657L;
+    private static final long serialVersionUID = -2097573470065558805L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java
index f68e029ef2f7..fd8156ab39c1 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 = 8900886091252241871L;
+    private static final long serialVersionUID = 6906311291135613519L;
 
     /** @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 af8c6bb74d89..9b37a76df87c 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 = -87634762682680445L;
+    private static final long serialVersionUID = -4595311523765957629L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 1658a91aab1a..195e6e8a018e 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 = -6396997063161897392L;
+    private static final long serialVersionUID = -6397005165831930542L;
 
     /** @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 5828c0c23d9e..4919446f43cf 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 = -9066889783363647191L;
+    private static final long serialVersionUID = -9066889322392328316L;
 
     /** @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 ed16737f5fb4..820fde90260a 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 = 1299089859501244748L;
+    private static final long serialVersionUID = 8080971299001945516L;
 
     /** @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 e2b70c6dadbf..a0f77ca8ab1e 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 = 2727355229527303248L;
+    private static final long serialVersionUID = 6163210369486665067L;
 
     /** @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 cd09a65753ed..e0b79e108ba9 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 = 193255622848852465L;
+    private static final long serialVersionUID = -5665597501016191055L;
 
     /** @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 31286f85149d..9006e1c87ff0 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 = -1777261577221376909L;
+    private static final long serialVersionUID = 8996336146955315571L;
 
     /** @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 c6b65cce5a81..78cfe4be8dc4 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 = -2936118372652433198L;
+    private static final long serialVersionUID = 5851398593448477746L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java
index 969d940a8031..37accf456e8b 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 = -7655930987234343233L;
+    private static final long serialVersionUID = -7655931127999601134L;
 
     /** @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 429e75f86da6..f3099896e51d 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 = -2271120872918553147L;
+    private static final long serialVersionUID = -2271120731923357400L;
 
     /** @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 3817adf1cfa9..1212dbfd6457 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 = 4147532567330084907L;
+    private static final long serialVersionUID = 4147520634320519471L;
 
     /** @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 d969edb3f96b..eb218d1131d3 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 = 481716755015888774L;
+    private static final long serialVersionUID = 481717226465606123L;
 
     /** @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 67ba8a94ac4d..4ff9127f68bf 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 = -4426887545457110384L;
+    private static final long serialVersionUID = -4426884737805741422L;
 
     /** @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 f4007cadf714..6f881de07710 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 = 850544550900226448L;
+    private static final long serialVersionUID = 850536448230332690L;
 
     /** @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 ca6df80badcc..192c35f82dae 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 = -4328899451318034073L;
+    private static final long serialVersionUID = -4328902258978602907L;
 
     /** @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 208287bed38e..834b67787094 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 = -5081817913080401623L;
+    private static final long serialVersionUID = -5081815105428893269L;
 
     /** @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 0059037e71f4..e0317ab31f30 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 = 643087611523920110L;
+    private static final long serialVersionUID = 643087501822794371L;
 
     /** @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 9092047c3784..264aa14eabf1 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 = -2438004758485921078L;
+    private static final long serialVersionUID = -2438005219457265049L;
 
     /** @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 c41087e29b0a..daec0d01efa2 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 = -1097255491420320824L;
+    private static final long serialVersionUID = 8975682946744120210L;
 
     /** @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 39b94bc0bdbf..9808369bd557 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 = -8813705669777612008L;
+    private static final long serialVersionUID = -8813712165918728344L;
 
     /** @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 b7145602d4d3..f7364ef79652 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 = 3651537242377881278L;
+    private static final long serialVersionUID = 3651536701321520979L;
 
     /** @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 a088e9b30d0c..82b197a73c46 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 = 8804374177035279131L;
+    private static final long serialVersionUID = 8804373705589952886L;
 
     /** @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 9ec9ff7f2827..5abe5da95043 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 = -4989065473042149896L;
+    private static final long serialVersionUID = -4989059015837815829L;
 
     /** @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 8ed89850c93e..6191cf74559d 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 = -5353758113749734867L;
+    private static final long serialVersionUID = -5353758574739537408L;
 
     /** @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 5685397ab1fd..cb0c6cf63f46 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 = -6522143020502688196L;
+    private static final long serialVersionUID = -6522143241407754479L;
 
     /** @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 67fcb0280876..66048302ded8 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 = 7620284984067410303L;
+    private static final long serialVersionUID = 7620284843237962258L;
 
     /** @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 293e95dff132..02ac5c022a9b 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 = -8604036337210282326L;
+    private static final long serialVersionUID = 3554747131295446506L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java
index 9ff2f6de53a6..b60d50b02db3 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 = -3523221166193311006L;
+    private static final long serialVersionUID = -273452932830404796L;
 
     /** @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 05ef40d9cb8e..baec2fa58bee 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 = -7785081040337175459L;
+    private static final long serialVersionUID = 374139325574468386L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java
index f145b6db35f5..6293c2b3e327 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 = 4995619567347297645L;
+    private static final long serialVersionUID = 4995621181687137545L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java
index b8626bccf31f..ad2345f51cbc 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 = 4200257590721032629L;
+    private static final long serialVersionUID = 3334346147684049205L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/MyClass.java b/slice2java/cpp/test/Ice/stream/Test/MyClass.java
index a9cbb49035d1..6e7318a8f48b 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 = -3687526066026212924L;
+    private static final long serialVersionUID = 3009489979094027460L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/stream/Test/MyException.java b/slice2java/cpp/test/Ice/stream/Test/MyException.java
index 5e06dcf289eb..ffb40b09723b 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 = 5734226142953702634L;
+    private static final long serialVersionUID = 5734229079756598926L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java
index a7c28fbf9b01..ce5754e9b862 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 = 2471050471834632242L;
+    private static final long serialVersionUID = 197839988111900018L;
 
     /** @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 80af77e2fced..3ee85a051b8c 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 = -1404709924420435769L;
+    private static final long serialVersionUID = -1404706569494848221L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java
index 1d87fd874de5..febde25324b6 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 = -317612217762234689L;
+    private static final long serialVersionUID = 4959493538153888219L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java
index 3bebe6254c72..e4a0b919a96c 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 = -8562124535477056331L;
+    private static final long serialVersionUID = -8562122507720407663L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java
index e41b3c88ff89..72f9aac283fc 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 = -4383792771642405757L;
+    private static final long serialVersionUID = -4452568056319226713L;
 }
diff --git a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java
index 9feedd5455c8..bc746deeee77 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 = -8728754379302048965L;
+    private static final long serialVersionUID = -1770581953054435729L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java
index 6a2d3166ec11..6a3005e8d129 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 = 391261029213309913L;
+    private static final long serialVersionUID = 7794063316989184858L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java
index da432f6ade0d..878f6399649b 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 = -7693313962892590099L;
+    private static final long serialVersionUID = 5363477235339284846L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 07358d2b2837..fb380ebc0883 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 = -1653943406665666750L;
+    private static final long serialVersionUID = 4104625244790417032L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 896ea7bf7cc9..f78c4e35c060 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 = -6280615640596378326L;
+    private static final long serialVersionUID = 3166329448366959334L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java
index 859f26abb28b..1af9604982fd 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 = 3110458223996017989L;
+    private static final long serialVersionUID = -605158690869800762L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java
index fa46427eaa7c..303f6031dcb3 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 = -5894954831690095686L;
+    private static final long serialVersionUID = 2179957808556320844L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java
index 06a123605ccf..62e0de138ae9 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 = -5579794569032474227L;
+    private static final long serialVersionUID = 1625139801578027771L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index 96b9ded02d21..352749212875 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 = 2245149332195759718L;
+    private static final long serialVersionUID = -2726305744437254484L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index 0ffc65bde407..46b6aff6a17c 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 = 3883217033271556570L;
+    private static final long serialVersionUID = -1262635860373656426L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java
index 9335a687fded..f8b0ba9a536a 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 = 988076511629777685L;
+    private static final long serialVersionUID = -8326484930374298218L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java
index 042267fecc63..82af2b0500b2 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 = 5127395177512456520L;
+    private static final long serialVersionUID = 5127391505883380850L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java
index 78f4b64d87ab..f122737016c2 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 = -7135055926448155683L;
+    private static final long serialVersionUID = -7135052985783827605L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java
index 9d344c8e6ded..3ac27f9a001b 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 = 1347176956259508675L;
+    private static final long serialVersionUID = 7164273427781625974L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java
index d6ef55989a41..b11a75acb96b 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 = 978892609170096697L;
+    private static final long serialVersionUID = 8417442622419048352L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java
index 2619595ebf77..4f107e4631fd 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 = 2005982040342647614L;
+    private static final long serialVersionUID = -6028977377275053109L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java
index b2be4429d26b..f0857371b5bf 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 = -6841486087733665927L;
+    private static final long serialVersionUID = 213299819556871244L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java
index b215feabbf1b..99dcb6ad83f0 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 = -910503393673497227L;
+    private static final long serialVersionUID = -507647843032010382L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java
index 6b5063d0e7b3..245b3c26952c 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 = 6647392216250897333L;
+    private static final long serialVersionUID = -1317639969275309514L;
 }
diff --git a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java
index 1e4050958eea..f9f068764a7c 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 = -3780746664757935938L;
+    private static final long serialVersionUID = 3511732231692541012L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/A.java b/slice2java/csharp/test/Ice/exceptions/Test/A.java
index ddb198ed835e..39b8ab1c9882 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 = 7823745081847920425L;
+    private static final long serialVersionUID = 7823745307935383707L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/B.java b/slice2java/csharp/test/Ice/exceptions/Test/B.java
index 8e80f2f4dfd1..9a7329907566 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 = -3861410651356194967L;
+    private static final long serialVersionUID = -3861410590576631717L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/C.java b/slice2java/csharp/test/Ice/exceptions/Test/C.java
index 77c0827fd9a0..fcebc747968f 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 = 1080698773050705705L;
+    private static final long serialVersionUID = 1080698999138168987L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/D.java b/slice2java/csharp/test/Ice/exceptions/Test/D.java
index ce9e274d763b..698b046cb8be 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 = 4780381616745883241L;
+    private static final long serialVersionUID = 4780381677525446491L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Color.java b/slice2java/csharp/test/Ice/hash/Test/Color.java
index 89384074d4ae..18b3a1fafaca 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 = -8349112164599656586L;
+    private static final long serialVersionUID = -1359131287622439818L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java
index fb0ef0f24333..bc14d552a696 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 = -2820066535339269984L;
+    private static final long serialVersionUID = -2820063148957551322L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Draw.java b/slice2java/csharp/test/Ice/hash/Test/Draw.java
index e0d0bc1b75a4..7dc43a86f57a 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 = -2731573767099618495L;
+    private static final long serialVersionUID = -7268386314040462259L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java
index e9b5cbaaf85e..9820fee26b18 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 = -1224574041223206821L;
+    private static final long serialVersionUID = -1224575944849965771L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java
index dec975617245..1c5f4240ff22 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 = -8727127988153466583L;
+    private static final long serialVersionUID = -8727125919219181305L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/OtherException.java b/slice2java/csharp/test/Ice/hash/Test/OtherException.java
index 81a5cc62fcbb..fe709032e956 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 = 3136668598712484872L;
+    private static final long serialVersionUID = -3278427620885127030L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Pen.java b/slice2java/csharp/test/Ice/hash/Test/Pen.java
index 3ec3dc90e156..c3c4ec7bd0c2 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 = -4552414048231004735L;
+    private static final long serialVersionUID = -6193150019265354593L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/hash/Test/Point.java b/slice2java/csharp/test/Ice/hash/Test/Point.java
index 884cc1828599..b5562c626c20 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 = -1008243259922793872L;
+    private static final long serialVersionUID = 7529082248620420080L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/PointD.java b/slice2java/csharp/test/Ice/hash/Test/PointD.java
index 9c2cdb79e937..3903ed6568cd 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 = -4622095726965547556L;
+    private static final long serialVersionUID = -9063157505237823186L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/PointF.java b/slice2java/csharp/test/Ice/hash/Test/PointF.java
index dad523a15bc9..7bf6968ccc48 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 = -8198917762216437369L;
+    private static final long serialVersionUID = 4367673292847300282L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Polyline.java b/slice2java/csharp/test/Ice/hash/Test/Polyline.java
index 2c0c8075763d..87f7ff8a241e 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 = -345037173157322547L;
+    private static final long serialVersionUID = -345039402085829471L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java
index aaa80c576d70..efb147fdbb02 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 = 2568820117200597079L;
+    private static final long serialVersionUID = 2568824769070244704L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java
index 8f770ca48f41..866ee5cc0f88 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 = -6709851971866598950L;
+    private static final long serialVersionUID = -6709851253691962195L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java
index 2524fa4ce732..fc139972712f 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 = 244437868416559544L;
+    private static final long serialVersionUID = 244431855187735183L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java
index 702af2ed61bd..1f13cc441a23 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 = -1207064053553965243L;
+    private static final long serialVersionUID = -1207059647183840526L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
index 001b2f4e0b18..6afeeadb21c6 100644
--- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
+++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7599601709367291855L;
+    private static final long serialVersionUID = 7599607722596116216L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java
index 35fbdfb24de0..1b991866c866 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 = 9211528662773864335L;
+    private static final long serialVersionUID = 9211526290423174107L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java
index ed3019b402b4..3f28bb510480 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 = 770572315430384985L;
+    private static final long serialVersionUID = 770568902192195725L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java
index f36d158f2f6c..be4c88554d52 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 = -4823059599364906432L;
+    private static final long serialVersionUID = -4823056196270839532L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java
index 7a7c005ece05..e57572bfd076 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 = 2279079101452264005L;
+    private static final long serialVersionUID = 2279076729217826449L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/A.java b/slice2java/csharp/test/Ice/objects/Test/A.java
index d4b88f454e45..49cde3bacbb3 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 = 8694170876754088936L;
+    private static final long serialVersionUID = -8948227818942180901L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/A1.java b/slice2java/csharp/test/Ice/objects/Test/A1.java
index 6f9334ceae08..b9b956d4c282 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 = -5926743336073175655L;
+    private static final long serialVersionUID = -5926736957438737072L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/B.java b/slice2java/csharp/test/Ice/objects/Test/B.java
index bd9a31c0d0d4..74e3f0744e65 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 = -8890910533428327816L;
+    private static final long serialVersionUID = -8890913781447080803L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/B1.java b/slice2java/csharp/test/Ice/objects/Test/B1.java
index 46c6d15c3495..7356797654f9 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 = -2685684487989194876L;
+    private static final long serialVersionUID = 1953198371898250244L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Base.java b/slice2java/csharp/test/Ice/objects/Test/Base.java
index 05f181699d54..147a07601e3d 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 = 8603688046118768799L;
+    private static final long serialVersionUID = -2004296324157080111L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/C.java b/slice2java/csharp/test/Ice/objects/Test/C.java
index 60e81aff791a..f99e779b833e 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 = 8903934873391794359L;
+    private static final long serialVersionUID = -6984081141540371025L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/COneMember.java b/slice2java/csharp/test/Ice/objects/Test/COneMember.java
index b9d5c450d153..68058567bfbe 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 = 3050969224125317105L;
+    private static final long serialVersionUID = 3050967017076234418L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java
index 3f98038da7c4..705adf0fb3f4 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 = -3018931226543565157L;
+    private static final long serialVersionUID = 464358500612241307L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/D.java b/slice2java/csharp/test/Ice/objects/Test/D.java
index 20c0670a239c..8de88e05d233 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 = -4829726671959459980L;
+    private static final long serialVersionUID = -5475288501263856702L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/D1.java b/slice2java/csharp/test/Ice/objects/Test/D1.java
index dae5fedbb410..e2fec96a1ca8 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 = -502144858978081853L;
+    private static final long serialVersionUID = -5971124261575652157L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/E.java b/slice2java/csharp/test/Ice/objects/Test/E.java
index 64b7783d0b9e..7a49863dbd8f 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 = 1419131926125345204L;
+    private static final long serialVersionUID = -8987826436307943682L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/EBase.java b/slice2java/csharp/test/Ice/objects/Test/EBase.java
index bee97a1a332a..133e1073df0a 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 = -4623831025055869874L;
+    private static final long serialVersionUID = -7215312614374434866L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/EDerived.java b/slice2java/csharp/test/Ice/objects/Test/EDerived.java
index d0f47c17fefe..cb67456727e6 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 = 2955276852288822610L;
+    private static final long serialVersionUID = 5085968204434003282L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java
index 0f45fd2091d9..b857ec2544e1 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 = -6225284241049564610L;
+    private static final long serialVersionUID = -6225277862410522243L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java
index ab1fd6f46f6d..7212e752c78b 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 = -6127041987419177964L;
+    private static final long serialVersionUID = 8523751072057711636L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/F.java b/slice2java/csharp/test/Ice/objects/Test/F.java
index 16984bc2864d..b90cd60843bf 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 = -8868497239726563951L;
+    private static final long serialVersionUID = -8539688018359885551L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/F1.java b/slice2java/csharp/test/Ice/objects/Test/F1.java
index 4a2adf57d217..6c8f061716e1 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 = 6192372066786440358L;
+    private static final long serialVersionUID = 6192369658271058175L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/F3.java b/slice2java/csharp/test/Ice/objects/Test/F3.java
index a244969dd141..e5d062aba5a3 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 = -6622165822054121608L;
+    private static final long serialVersionUID = 4436940739549051336L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/IBase.java b/slice2java/csharp/test/Ice/objects/Test/IBase.java
index dd2737f51faa..a0a47589c39e 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 = 4060267000707382111L;
+    private static final long serialVersionUID = 4060273059048137366L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/IDerived.java b/slice2java/csharp/test/Ice/objects/Test/IDerived.java
index 181b9a610a37..015fa95cc15e 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 = 7299531962701877575L;
+    private static final long serialVersionUID = 7299539304627747982L;
 
     /** @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 fabd2887f872..97f47455b680 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 = -1425258289867794030L;
+    private static final long serialVersionUID = -1425250627717082057L;
 
     /** @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 8a1cadaa7252..772cf74a0032 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 = -2337226532764255968L;
+    private static final long serialVersionUID = -2337227135944305943L;
 }
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 ac220c25b3eb..070731f72aa9 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 = -1298687434324766416L;
+    private static final long serialVersionUID = -1298691002900597753L;
 
     /** @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 de73f19b92e7..362cf4ad5e46 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 = 1842230351958798276L;
+    private static final long serialVersionUID = 1842229428489800077L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/K.java b/slice2java/csharp/test/Ice/objects/Test/K.java
index cc9aed7101d6..758dccc10648 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 = 4645159121765779974L;
+    private static final long serialVersionUID = 4645163653445746420L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/L.java b/slice2java/csharp/test/Ice/objects/Test/L.java
index 0be85894e707..9592e60e8aee 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 = 6629747374001199442L;
+    private static final long serialVersionUID = 6629740032094441883L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/M.java b/slice2java/csharp/test/Ice/objects/Test/M.java
index dc8a0528f3fa..84d71b7e6c95 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 = -8088105370541090198L;
+    private static final long serialVersionUID = -8088104767356018387L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Recursive.java b/slice2java/csharp/test/Ice/objects/Test/Recursive.java
index 15ceb32a32c7..d6e59db73598 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 = 3617885796881285717L;
+    private static final long serialVersionUID = 3617890648857424812L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/S.java b/slice2java/csharp/test/Ice/objects/Test/S.java
index b9f6375da14e..6bf3da79846b 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 = 481774523532540129L;
+    private static final long serialVersionUID = 481776730591667112L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/S1.java b/slice2java/csharp/test/Ice/objects/Test/S1.java
index 216afafcd1e6..79ce55068ca0 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 = 7211342672462008567L;
+    private static final long serialVersionUID = 7211336613998826068L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/SC1.java b/slice2java/csharp/test/Ice/objects/Test/SC1.java
index 56ce2867fbfc..c341dce6c518 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 = 186210504600022027L;
+    private static final long serialVersionUID = 186212711635161666L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java
index 5f5255f54ba8..3ee72ff0f25e 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 = 6227745254955094952L;
+    private static final long serialVersionUID = 6227747141710777707L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java
index bc3bdd9fc693..8a27ee1b2bb5 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 = -6909041849692480894L;
+    private static final long serialVersionUID = -8692453288153359998L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/StructKey.java b/slice2java/csharp/test/Ice/objects/Test/StructKey.java
index 293174f4d5a6..5c0374c51235 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 = 592562913144145016L;
+    private static final long serialVersionUID = 4263983094447593138L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java
index 8c708b0b93c4..31c7b7f8022e 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 = 2723843498467112595L;
+    private static final long serialVersionUID = 2723846207967490521L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java
index 7035eb729fb5..bee22885618f 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 = 6332132727438535334L;
+    private static final long serialVersionUID = 6581747973116832925L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java
index 404db97de2b8..9cf0f0710f3f 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 = 2978299662843355645L;
+    private static final long serialVersionUID = -6676635123353671491L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java
index f0a5716bee38..18238973e949 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 = 7975779933716001039L;
+    private static final long serialVersionUID = -2532520166708702124L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/Structure.java b/slice2java/csharp/test/Ice/operations/Test/Structure.java
index 27f903498ae4..0d89234f167f 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 = 5447838317661400578L;
+    private static final long serialVersionUID = 7793646153169875424L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/A.java b/slice2java/csharp/test/Ice/optional/Test/A.java
index b44ea4743dc1..8293cca452f3 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 = 5327421427437229840L;
+    private static final long serialVersionUID = -2473283287136613488L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/B.java b/slice2java/csharp/test/Ice/optional/Test/B.java
index d076995bb689..61195b145ab2 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 = 6757096882597922403L;
+    private static final long serialVersionUID = -13920546803818141L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/C.java b/slice2java/csharp/test/Ice/optional/Test/C.java
index 734c00c1a411..ccec9b446239 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 = 183400776221338749L;
+    private static final long serialVersionUID = -9003734726404839043L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java
index 885c9b8b0940..fd73bbaa8c7b 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 = 1616556066829431103L;
+    private static final long serialVersionUID = 2314717529295171934L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/E.java b/slice2java/csharp/test/Ice/optional/Test/E.java
index 5ae19f40665e..e61d16219dd3 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 = -1850732468220660862L;
+    private static final long serialVersionUID = -1850730528431295567L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/F.java b/slice2java/csharp/test/Ice/optional/Test/F.java
index 6dd8548ada8f..0c3f3b7084b5 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 = -6430494041487746191L;
+    private static final long serialVersionUID = -6430490531121419582L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java
index 716172f35157..60c8f50e3996 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 = 1569613644242838737L;
+    private static final long serialVersionUID = 1569617242272409603L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/G.java b/slice2java/csharp/test/Ice/optional/Test/G.java
index 2536b7bbf700..346c63931ba4 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 = -3252006374286808173L;
+    private static final long serialVersionUID = 5876584683145726291L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/G1.java b/slice2java/csharp/test/Ice/optional/Test/G1.java
index 98d2a9a25a01..4fc58bc623c8 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 = 7339783408710830769L;
+    private static final long serialVersionUID = 7339779976147391568L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/G2.java b/slice2java/csharp/test/Ice/optional/Test/G2.java
index 5ea97841a9ad..882903f035c5 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 = 3824558145113423760L;
+    private static final long serialVersionUID = 3824560084898192262L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java
index c89c2bdfbe61..dd716a721616 100644
--- a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java
+++ b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java
@@ -1603,7 +1603,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 66866693466940770L;
+    private static final long serialVersionUID = -1242496445221824650L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java
index 0c5844364615..f7e8e2f6e310 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 = -7219608758777871233L;
+    private static final long serialVersionUID = -7219605331217054163L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java
index bf9ae240f2cc..cd5d78a3bc85 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 = -8333108715967312385L;
+    private static final long serialVersionUID = 4065541090383052384L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java
index 87004f75d72c..1831c0454b4b 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 = 3366070586506137531L;
+    private static final long serialVersionUID = -1485233726019808581L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java
index 351a3a7e20a5..1c6ce1847e24 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 = 2894245529678019768L;
+    private static final long serialVersionUID = 2894242350080601113L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java
index ce22998ef108..21d606f367f3 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 = 6700991992407302442L;
+    private static final long serialVersionUID = 6700995337461922137L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java
index 4dbba46e309a..000b92440c23 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 = -1912285458872756679L;
+    private static final long serialVersionUID = -1912288891436753448L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/WD.java b/slice2java/csharp/test/Ice/optional/Test/WD.java
index 1447cc81f467..53e4e84a93bb 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 = -5056969722114669458L;
+    private static final long serialVersionUID = -5370402901652373667L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C.java b/slice2java/csharp/test/Ice/scope/Test/C.java
index 54a56197ddbb..38c1cfa4da25 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 = -5190252137500538396L;
+    private static final long serialVersionUID = -5190251599022438526L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C1.java b/slice2java/csharp/test/Ice/scope/Test/C1.java
index fc04209761eb..a8c4adfd51dd 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 = 8893237890074837703L;
+    private static final long serialVersionUID = 8893231565696684527L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C2.java b/slice2java/csharp/test/Ice/scope/Test/C2.java
index ade2bb70917d..68029ce21f3c 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 = -5852833065632754396L;
+    private static final long serialVersionUID = -3441575983498332895L;
 
     /** @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 16241f472947..f65d3b71780b 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 = 4615624974739167067L;
+    private static final long serialVersionUID = 4615629976502065421L;
 
     /** @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 70c9e38f9919..bd64fc34ca59 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 = 672596283603247104L;
+    private static final long serialVersionUID = 672584754726737060L;
 
     /** @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 d5b9554544d3..e41ecf8afc14 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 = 8654434744632603156L;
+    private static final long serialVersionUID = 8654440903551071088L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java
index 2545234c808f..927accbbbefd 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 = 3694622191795774680L;
+    private static final long serialVersionUID = 3694611819952108860L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S.java b/slice2java/csharp/test/Ice/scope/Test/S.java
index 1f877330b3c9..2013509785d1 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 = 2159704710657739942L;
+    private static final long serialVersionUID = 2159709712572988418L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S1.java b/slice2java/csharp/test/Ice/scope/Test/S1.java
index 5cb32bfca894..8b166e9a3bfb 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 = 1241675355265476094L;
+    private static final long serialVersionUID = 1241676059184232278L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S2.java b/slice2java/csharp/test/Ice/scope/Test/S2.java
index ee4e96c6407a..e74dad005571 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 = 4440263256530229725L;
+    private static final long serialVersionUID = -8349259283807362344L;
 }
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java
index 7cbece0b31e3..111dffe77983 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 = 2039943212506317898L;
+    private static final long serialVersionUID = 2039936950258749826L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java
index 6121c1937a8c..cfd826869a8b 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 = -3369457416135775899L;
+    private static final long serialVersionUID = -3369456608944799399L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/S.java b/slice2java/csharp/test/Ice/seqMapping/Test/S.java
index 11e908637d95..9b4d139a24cd 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 = -691305381204023606L;
+    private static final long serialVersionUID = -691296639244115978L;
 }
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java
index 040205112ad3..880d6f874041 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 = 9219744332388749742L;
+    private static final long serialVersionUID = 9219736708862246098L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java
index 9db90461c978..1fc9e1584ca4 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 = -477020388831682043L;
+    private static final long serialVersionUID = -477024361391432217L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java
index ea810b57d957..02de5aef1af5 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 = 3485217831766341923L;
+    private static final long serialVersionUID = 3485213704220660609L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 08faef6fac68..6cd4e7273fa5 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 = 1717374666919683794L;
+    private static final long serialVersionUID = 1717378639460894960L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 0483d9854195..74c43cfd891e 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 = -7384914983267617525L;
+    private static final long serialVersionUID = -7384919110795034135L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index aba8b614fe9b..3089a352d089 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 = 3424370158961017035L;
+    private static final long serialVersionUID = 3424382310452201676L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index ad8f9ae39677..d482e9afdbaf 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 = -1172598621731431526L;
+    private static final long serialVersionUID = -1172594567900958307L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index c406cd1b79aa..04f0ce83d89d 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 = -1126113782819140765L;
+    private static final long serialVersionUID = -1126112536644632092L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index 70ac5480d172..3ad5098b9bc4 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 = -2097583578456675645L;
+    private static final long serialVersionUID = -2097571426965491004L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java
index 48c86c234ca8..3ba2f538a3a6 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 = -3157432657687734513L;
+    private static final long serialVersionUID = -6419835957234260639L;
 
     /** @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 a983e444dc46..bf6f98d775ed 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 = -2236578237639610429L;
+    private static final long serialVersionUID = -46176091996290515L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 61ca3d0d8e4d..671eca0fc885 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 = -6396993717193195370L;
+    private static final long serialVersionUID = -6396997786500736826L;
 
     /** @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 1ad8d93fa414..126a8ae210b8 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 = -9066884772477004797L;
+    private static final long serialVersionUID = -9066880785678457076L;
 
     /** @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 99e5a5fa6127..0f53e1042321 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 = -6864403891877750964L;
+    private static final long serialVersionUID = -2021312777349300350L;
 
     /** @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 1e63018c87e3..1e6988321ce2 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 = 248415219996648316L;
+    private static final long serialVersionUID = 5418532825973568946L;
 
     /** @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 3196bb3e145b..cb3525ebe6c1 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 = -2363537053577521229L;
+    private static final long serialVersionUID = -4517221422683103565L;
 
     /** @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 9082e9a45c91..c67072427925 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 = 8790018501503024435L;
+    private static final long serialVersionUID = 5403949557076447539L;
 
     /** @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 20f8645ef131..0ed5afeb5a56 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 = -7569561648546757934L;
+    private static final long serialVersionUID = 3928131959357435604L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java
index 3924c91c671b..e6637b6a4ccd 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 = -7655930543124054860L;
+    private static final long serialVersionUID = -7655923949967971724L;
 
     /** @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 84d9f0e52800..da4497bca226 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 = -2271121317027133009L;
+    private static final long serialVersionUID = -2271127909926386257L;
 
     /** @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 6e4784efc813..d655a4da35b0 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 = 4147520990601951729L;
+    private static final long serialVersionUID = 4147520634320523819L;
 
     /** @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 7b70dc22b087..af86ad0a18d3 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 = 481709698586420588L;
+    private static final long serialVersionUID = 481713811925735421L;
 
     /** @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 4b5385818c2e..0f1ef435605c 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 = -4426878909336750634L;
+    private static final long serialVersionUID = -4426882813630788218L;
 
     /** @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 59d88c059c9f..bd9dbd96904f 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 = 850535744320808990L;
+    private static final long serialVersionUID = 850539813812175950L;
 
     /** @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 fc0ff7956c83..c60b61cb299a 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 = -4328906764985936805L;
+    private static final long serialVersionUID = -4328908354674978037L;
 
     /** @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 353c0b8733f9..4c3411b64c6c 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 = -5081810519513709335L;
+    private static final long serialVersionUID = -5081806284714270407L;
 
     /** @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 ef05a01396aa..dbd7dc48c1df 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 = 643089729531372164L;
+    private static final long serialVersionUID = 643085781560343051L;
 
     /** @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 7877e6551c0b..913b43b7e564 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 = -2437998693904140320L;
+    private static final long serialVersionUID = -2438013756388016019L;
 
     /** @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 f97a0495671d..678ce3bc8d3d 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 = -2053785834442035803L;
+    private static final long serialVersionUID = -6667295310729692564L;
 
     /** @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 fe52ad2f60ac..be0e3fc484a8 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 = -8813705158375464413L;
+    private static final long serialVersionUID = -8813712165918732692L;
 
     /** @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 ba7022e1cb63..7f12b332071f 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 = 4410706858529189223L;
+    private static final long serialVersionUID = 4410699530637199549L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java
index 1261a283d2ad..77772535cda7 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 = 3651536116374210580L;
+    private static final long serialVersionUID = 3651529523513572243L;
 
     /** @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 522cba90a361..1ef7862eb091 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 = 8804375613156721585L;
+    private static final long serialVersionUID = 8804382575548758070L;
 
     /** @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 d7ced59147ad..33e68acfbe17 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 = -4989053916977555341L;
+    private static final long serialVersionUID = -4989059015837828377L;
 
     /** @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 6786f974c109..a5789772ff38 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 = -5353757669489213369L;
+    private static final long serialVersionUID = -5353761986941047360L;
 
     /** @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 9d83798cf8dd..d4e46895dbe5 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 = -6522143981502050282L;
+    private static final long serialVersionUID = -6522139829445796722L;
 
     /** @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 bde75235b2de..47d5aee9d9e0 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 = 7620281130331726229L;
+    private static final long serialVersionUID = 7620287927463669133L;
 
     /** @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 a142c112147c..b5b9876ef719 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 = -1331216741173109206L;
+    private static final long serialVersionUID = 5190588176926229660L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java
index 9d1f967ab418..803e50ac4e15 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 = -936888818870419007L;
+    private static final long serialVersionUID = 1378431081744972252L;
 
     /** @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 3d794f7d5ab3..04929dc9b9cb 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 = -8687077198690198407L;
+    private static final long serialVersionUID = -6819440979518952757L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java
index 7fe77f0b344d..de901c21e1a2 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 = -1893908186866836833L;
+    private static final long serialVersionUID = 880535472471346721L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/MyClass.java b/slice2java/csharp/test/Ice/stream/Test/MyClass.java
index 1b3793883b42..2a044fc925ed 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 = -8902786958938064870L;
+    private static final long serialVersionUID = -4999738324413906862L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/stream/Test/MyException.java b/slice2java/csharp/test/Ice/stream/Test/MyException.java
index 35083ebf7d8f..a3e9b02b7446 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 = 5734228449510855425L;
+    private static final long serialVersionUID = 5734228809642958955L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java
index 092507ef8b33..4a45c750a985 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 = 8325551705499751168L;
+    private static final long serialVersionUID = -8493083601997877611L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/Clash/Cls.java b/slice2java/csharp/test/Slice/escape/Clash/Cls.java
index 72dd1627b694..adda7c4ae3c3 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 = -4083623596547706836L;
+    private static final long serialVersionUID = 4169962089549110909L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/Clash/Ex.java b/slice2java/csharp/test/Slice/escape/Clash/Ex.java
index d4ddabf1fb18..d4b7702fe9c8 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 = 6600312552336105085L;
+    private static final long serialVersionUID = -3646790736313786612L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/Clash/St.java b/slice2java/csharp/test/Slice/escape/Clash/St.java
index c6e33bd4fc94..ec1c32be86fb 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 = -8421626244485318594L;
+    private static final long serialVersionUID = -1730167785889506562L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java
index 1c78992508a3..3d5f8d7c5a27 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 = 8188292103575807186L;
+    private static final long serialVersionUID = 7601503399670788594L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/_break.java b/slice2java/csharp/test/Slice/escape/_abstract/_break.java
index 3b42352e238b..b709d9d3c427 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 = 3009641433759389693L;
+    private static final long serialVersionUID = 3009638331809865437L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java
index fa7a8996396d..6bbf6fdb5b97 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 = 5916974855242209156L;
+    private static final long serialVersionUID = 4146478819440818532L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java
index e7febaf0d42d..95ddbac2ccd7 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 = -8293822231130394391L;
+    private static final long serialVersionUID = -8293824010616718391L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java
index e2d09bd4cb84..6cde6b4bfb87 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 = -410945537101642685L;
+    private static final long serialVersionUID = -6793466026004653565L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java
index 87622ecf0b6d..952955071db9 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 = -8947417296782968319L;
+    private static final long serialVersionUID = -6611957475835757087L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/macros/Test/Default.java b/slice2java/csharp/test/Slice/macros/Test/Default.java
index 9a220c8c98ee..51f50dd500da 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 = -3048424478030616258L;
+    private static final long serialVersionUID = 7542703622590178430L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java
index f1a7edd0eb39..0d626cbace82 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 = -5395029138995322145L;
+    private static final long serialVersionUID = -8792697174889241185L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/structure/Test/C.java b/slice2java/csharp/test/Slice/structure/Test/C.java
index 841d68b53562..ab38bfb03432 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 = -3172282834878000745L;
+    private static final long serialVersionUID = -3172275306991087030L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/structure/Test/S1.java b/slice2java/csharp/test/Slice/structure/Test/S1.java
index 47bcf18b5087..5b02723b1ee0 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 = -5542853900638132189L;
+    private static final long serialVersionUID = -5542862748393121498L;
 }
diff --git a/slice2java/csharp/test/Slice/structure/Test/S2.java b/slice2java/csharp/test/Slice/structure/Test/S2.java
index fd0f50694e8b..098e120a9148 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 = 2289214937902139827L;
+    private static final long serialVersionUID = -3259474157147119230L;
 }
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 e845dc10b997..085731d0c68c 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 = 278046589258834855L;
+    private static final long serialVersionUID = 7936114407063410269L;
 }
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 40aa748a4ff4..54a1a139d41e 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 = 6434295670602490949L;
+    private static final long serialVersionUID = 6434296931074495146L;
 
     /** @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 46941eb29096..901705c10d40 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 = 6384636218372786221L;
+    private static final long serialVersionUID = 6384638286001028465L;
 }
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 d79c8ab8f829..a1cd76a03179 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 = -2014571034036185677L;
+    private static final long serialVersionUID = -2014565202943311600L;
 }
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 1db63f737c4b..ab170bd87d70 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 = 76059378986899890L;
+    private static final long serialVersionUID = -6626721954777549992L;
 
     /** @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 8fa47e14f90f..1fdb4d09132f 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 = -8416342960967621050L;
+    private static final long serialVersionUID = 2709881475346744044L;
 }
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 8fa42ab8dba6..fd0b1b7bfd94 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 = -3740196203793698039L;
+    private static final long serialVersionUID = -3294665152529885860L;
 
     /** @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 30bcd6c687d0..1c0b7ff4120d 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 = -5539689816010100804L;
+    private static final long serialVersionUID = 7063021362656588035L;
 
     /** @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 7dc3ec63ec12..833a59a432d6 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 = 4481140440238208749L;
+    private static final long serialVersionUID = 1916173140200375061L;
 
     /** @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 0c5e97770bf3..5c335fd4e511 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 = -6963426537074569126L;
+    private static final long serialVersionUID = 4580146582406528930L;
 }
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 93fce99d72d1..00d8a8636ad2 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 = 532046912707954029L;
+    private static final long serialVersionUID = -6915563996890301896L;
 }
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 d330424a135c..e2431d74150a 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 = 3348973884143779788L;
+    private static final long serialVersionUID = -2429926332696072909L;
 }
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 30a727c9dcd2..5cbda1998f6e 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 = 5127390245353749332L;
+    private static final long serialVersionUID = 5127391505883680194L;
 }
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 bc52f55482c1..3f948f621204 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 = -8697848198419535233L;
+    private static final long serialVersionUID = -3660838068745548915L;
 }
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 5f838db8be78..41aaa222c359 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 = -3396650348558093613L;
+    private static final long serialVersionUID = 6119044296510572514L;
 }
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 f047e033e5a4..690156d17c20 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 = -3349270424792411609L;
+    private static final long serialVersionUID = 5298248033510148421L;
 }
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 11e625025fb8..2f47e401287b 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 = 7823744582073529534L;
+    private static final long serialVersionUID = 7823746586488590314L;
 }
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 bc235d408797..9acfc9397bd8 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 = -3861405861429582722L;
+    private static final long serialVersionUID = -3861409312023285974L;
 }
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 a993c121bcb2..60b08d7e5def 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 = 1080698273276314814L;
+    private static final long serialVersionUID = 1080700277691375594L;
 }
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 ad2ec7e43e6e..3681d4b5a281 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 = 4780386406672495486L;
+    private static final long serialVersionUID = 4780382956078792234L;
 }
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 487598ecdc4b..16cec27a533d 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 = 7823743258397062335L;
+    private static final long serialVersionUID = 7823738000909022736L;
 }
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 4a354e7eea44..6a8e5cb2cba2 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 = -3861407185106049921L;
+    private static final long serialVersionUID = -3861417732446890544L;
 }
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 6c0da6a1bf77..e0f876953a70 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 = 1080696949599847615L;
+    private static final long serialVersionUID = 1080691692111808016L;
 }
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 719b5f58a2c1..70fe5cf2fbc0 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 = 4780385082996028287L;
+    private static final long serialVersionUID = 4780374535655187664L;
 }
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 481e98aa5be2..d091a1821eda 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 = 1935514862242999286L;
+    private static final long serialVersionUID = 371610907875554294L;
 }
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 385cf20db3eb..90053981275f 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 = -2820064551580938803L;
+    private static final long serialVersionUID = -2820070911982413240L;
 }
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 7a5d77d4b37c..cc09a0a6626f 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 = -2208669180245760376L;
+    private static final long serialVersionUID = 5249535917137663853L;
 }
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 e1b1547d5974..af22279d4d95 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 = 3554723524174113886L;
+    private static final long serialVersionUID = 8933786064006194750L;
 
     /** @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 f60d2c068dc0..0e5d34a6c697 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 = -7310993893961945520L;
+    private static final long serialVersionUID = -8335061726253712720L;
 }
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 a6fdbb9d0ad4..76c5216b4d26 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 = 1543803797942997117L;
+    private static final long serialVersionUID = -4744458953505853160L;
 }
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 096a7ea11873..d37e9ec2ce8a 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 = -1436678704913781408L;
+    private static final long serialVersionUID = -2906890105874806203L;
 }
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 b567fa2e3fd6..c8522848ff9d 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 = -345027089311324811L;
+    private static final long serialVersionUID = -345033447300137168L;
 }
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 aae1c1866dcf..c312fcbd4223 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 = -111156133487888303L;
+    private static final long serialVersionUID = -5552025158531385263L;
 
     /** @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 ef463817fcf2..3ec75da0a8e2 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 = -5926742195803483052L;
+    private static final long serialVersionUID = -5926743479361507148L;
 
     /** @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 27e3362dce62..4cff15c8f255 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 = -8890920021668786692L;
+    private static final long serialVersionUID = -8890910390057071780L;
 
     /** @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 44bae0d00d0d..116ac19f1f2b 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 = -1190616593570091388L;
+    private static final long serialVersionUID = -2457484090745672188L;
 
     /** @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 b810c285da13..b09f0fd706a4 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 = 4106208300533843103L;
+    private static final long serialVersionUID = 242875568138242911L;
 
     /** @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 e437cc3e95c1..ddc961ea857c 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 = -8728904621301745459L;
+    private static final long serialVersionUID = -6567978724557452435L;
 
     /** @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 45a6b3d25559..2ec144e3b771 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 = 3050973086820611208L;
+    private static final long serialVersionUID = 3050969245994727720L;
 
     /** @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 419ffd4c5add..c705aa438d63 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 = 7266085807236661915L;
+    private static final long serialVersionUID = 2391516221710721307L;
 
     /** @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 9bf802efa642..e0fa91ee511b 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 = -5609457354028322103L;
+    private static final long serialVersionUID = -3017175824864794967L;
 
     /** @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 5ab4375dc85d..2701a97d66cc 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 = 173172185490490435L;
+    private static final long serialVersionUID = -8949853912559176765L;
 
     /** @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 08ab7f4fe1b9..736f1a475992 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 = -2199796534071258376L;
+    private static final long serialVersionUID = 5132431819606708024L;
 
     /** @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 0a1b371a0708..0cbfd8b86169 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 = -6892064363795442610L;
+    private static final long serialVersionUID = 8857654788661589198L;
 }
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 b7722f090276..f2c3667adabd 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 = 6453020330056751698L;
+    private static final long serialVersionUID = 5186169198363274066L;
 }
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 0b89c03d9031..de33506cad31 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 = -6225288230311991289L;
+    private static final long serialVersionUID = -6225284058709449241L;
 }
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 0f6b5f553f92..0ecb4f39844c 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 = 7460503701569861012L;
+    private static final long serialVersionUID = 6964378340731156372L;
 }
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 9cd91d0f6574..e3a2672da5c4 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 = -4250514483580443567L;
+    private static final long serialVersionUID = -3624400275405880879L;
 
     /** @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 40efc11bbff7..53bb3cca45dd 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 = 6192373607419976898L;
+    private static final long serialVersionUID = 6192372910201598015L;
 
     /** @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 516758ad3d3c..cf800d53aff6 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 = -8206271751992405104L;
+    private static final long serialVersionUID = 504075528485909136L;
 
     /** @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 eb926da29663..b34b3cd7b8b3 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 = -1425257188544988010L;
+    private static final long serialVersionUID = -1425258472107890570L;
 
     /** @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 2ea1920f7260..b7fb6271d66e 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 = -2337227993493233555L;
+    private static final long serialVersionUID = -2337226714935065587L;
 }
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 a65a6995868b..61e5106b20e2 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 = -1298680552184477917L;
+    private static final long serialVersionUID = -1298687616514272637L;
 
     /** @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 b1948fb765bb..9a677ae9f508 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 = 1842234175935576329L;
+    private static final long serialVersionUID = 1842230335109697065L;
 }
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 f0bf254d092a..286d58e1f070 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 = 4645163276178232821L;
+    private static final long serialVersionUID = 4645159099727358229L;
 
     /** @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 d60424600d0e..ea7b99cad4d2 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 = 6629735031530357023L;
+    private static final long serialVersionUID = 6629747556177381055L;
 
     /** @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 3f385c2dd428..3af43c1c6967 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 = -8088093154482328904L;
+    private static final long serialVersionUID = -8088105348518148584L;
 
     /** @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 f530d6290df4..3c67dd386667 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 = 3617879040988214187L;
+    private static final long serialVersionUID = 3617885774858741963L;
 
     /** @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 525ad71fb9fc..9a7fec321f1b 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 = 481770330223288364L;
+    private static final long serialVersionUID = 481774506674302220L;
 }
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 a0fe1a2933f5..210a3744cc35 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 = 6227757431818317329L;
+    private static final long serialVersionUID = 6227745237929556337L;
 }
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 881d30bff5c1..81ba71903694 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 = -4858951556605251582L;
+    private static final long serialVersionUID = -2125265761085288190L;
 }
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 10cbc8d19fae..bf0aa4a57029 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 = 4199975612295082676L;
+    private static final long serialVersionUID = -6034046508043882508L;
 }
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 54332ba51e5d..38f60489c456 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 = 2723846392564246297L;
+    private static final long serialVersionUID = 2723843338315792065L;
 }
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 cd3180996d72..e66bcf536a57 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 = -1429259982854112292L;
+    private static final long serialVersionUID = -7346350965059425189L;
 
     /** @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 79545b9bd73e..5293cdc589d2 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 = -8723314999203750499L;
+    private static final long serialVersionUID = 7280438815546896925L;
 }
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 ea04fc117469..ff0df0c95839 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 = -3185633186669610379L;
+    private static final long serialVersionUID = -5104359498474545198L;
 }
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 0324cd639af7..184bfc3326bb 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 = 6971630647451510720L;
+    private static final long serialVersionUID = -6978484911727933166L;
 }
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 325b8089849d..fe57a1c2ae02 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 = 2723846349872206520L;
+    private static final long serialVersionUID = 2723847871362651962L;
 }
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 791d65386385..5ea01d19fc58 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 = -1781827295542905507L;
+    private static final long serialVersionUID = 5710020747197898880L;
 
     /** @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 bcb69e1d65ba..94e093d93483 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 = -6284310912637136515L;
+    private static final long serialVersionUID = -9071653162981014403L;
 }
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 08caf854844d..b4ad937f6c6c 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 = -1485536654666291212L;
+    private static final long serialVersionUID = -2381616683297658487L;
 }
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 cc1900b55ccd..f489ec89ee55 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 = -4761970575069666815L;
+    private static final long serialVersionUID = 1403020071691744649L;
 }
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 fc2e1e67defc..777f3d3e3238 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 = 649078683305694352L;
+    private static final long serialVersionUID = 3948312512565558800L;
 
     /** @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 d592d737cc5b..27c36b2b840a 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 = -930747976469754269L;
+    private static final long serialVersionUID = 1343632467662574947L;
 
     /** @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 c0edbce484ab..d99a624b31a1 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 = 6945312218075262461L;
+    private static final long serialVersionUID = -3416884719638790147L;
 
     /** @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 af2b121127be..ca5464930f58 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 = -3992086084484479854L;
+    private static final long serialVersionUID = 3731126179030997916L;
 }
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 3bd978dca1c0..2fe50e03a9bf 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 = -1850730829215037574L;
+    private static final long serialVersionUID = -1850739598278094732L;
 
     /** @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 346725df2173..bec074242f72 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 = -6430489548456116215L;
+    private static final long serialVersionUID = -6430492691894179065L;
 
     /** @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 40781d7370f5..f3d924019d60 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 = 1569610124901470579L;
+    private static final long serialVersionUID = 1569601355848047869L;
 }
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 47882317306f..4b435ecbbc3d 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 = -2706963842766611565L;
+    private static final long serialVersionUID = 1682165122201545235L;
 
     /** @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 58237f3c1cc5..a9da3a81452c 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 = 7339787093553166108L;
+    private static final long serialVersionUID = 7339784632006000402L;
 }
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 a35a8842e7cc..614ebe33089d 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 = 3824559102233493289L;
+    private static final long serialVersionUID = 3824551015065231911L;
 }
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 193f1f036a5f..64cc9336d824 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 = 3834018076033648778L;
+    private static final long serialVersionUID = 2191516178024412868L;
 
     /** @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 6a0a96efa924..f72c0e269f06 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 = -7219607840602388323L;
+    private static final long serialVersionUID = -7219599071548965613L;
 
     /** @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 bab458bbd817..080abaa7e0f3 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 = 6241840691005951053L;
+    private static final long serialVersionUID = 3248277981336206723L;
 }
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 647bd66887e4..d6a8d2eaeda6 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 = -4693242132804905413L;
+    private static final long serialVersionUID = -2542997863650195909L;
 
     /** @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 40523736f078..ad1cb1aad925 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 = 2894241883841599829L;
+    private static final long serialVersionUID = 2894238740399380315L;
 }
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 2a9d4f570710..d5c3da04c262 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 = 6700995803698941836L;
+    private static final long serialVersionUID = 6700987716531246722L;
 }
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 4a3f703b8e62..85562fdef751 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 = -1912281092135925100L;
+    private static final long serialVersionUID = -1912284235578144614L;
 }
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 0cd0ef16ef39..5c58a9cdfc98 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 = 6926894047908220001L;
+    private static final long serialVersionUID = -673557759946606559L;
 
     /** @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 aa7d96229f07..7178e9f22a53 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 = 7257567829969935888L;
+    private static final long serialVersionUID = -3369143378717346544L;
 
     /** @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 bc1db5840eba..4772643f582d 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 = -2513396383691372573L;
+    private static final long serialVersionUID = -5282427874601357917L;
 
     /** @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 c9ffced613a0..b2c3938ce4c3 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 = 6000856221792584061L;
+    private static final long serialVersionUID = -1060847372751236867L;
 
     /** @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 299137baa169..accf107b08e0 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 = -6311374294869841198L;
+    private static final long serialVersionUID = -2876011356006817086L;
 }
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 6c7f2b9dc47d..e925804958af 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 = -1850740613578126153L;
+    private static final long serialVersionUID = -1850732107768346549L;
 
     /** @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 ca52db3d86dd..5c7782f105c9 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 = -6430496806451970492L;
+    private static final long serialVersionUID = -6430493720049856840L;
 
     /** @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 119a51218daa..bd7d55372880 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 = 1569605664344920951L;
+    private static final long serialVersionUID = 1569613965727143826L;
 }
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 874d0987b3c0..da4eb39b1f6e 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 = 6332200578134056403L;
+    private static final long serialVersionUID = -5081764830304123629L;
 
     /** @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 351f4477714b..c051fc822134 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 = 7339780643748791772L;
+    private static final long serialVersionUID = 7339782921958381132L;
 }
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 d89f65136e80..7492c0ef33e9 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 = 3824549999749149974L;
+    private static final long serialVersionUID = 3824557823675426600L;
 }
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 b224dce17bcb..1790f78a9fa6 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 = -6938310077873893795L;
+    private static final long serialVersionUID = 4481959866575533862L;
 
     /** @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 750e540c3f70..509a3f9db426 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 = -7219600698794998119L;
+    private static final long serialVersionUID = -7219609119160208964L;
 
     /** @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 3b4710d79d4d..0dc0bd7e1e40 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 = 6451397314733766868L;
+    private static final long serialVersionUID = 7796947186222510872L;
 }
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 f0afd8f7e345..c3e7ed2fda7e 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 = 7826508489209998459L;
+    private static final long serialVersionUID = -916307767891038661L;
 
     /** @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 2bffa07ddab6..4d409e6da086 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 = 2894242844791160085L;
+    private static final long serialVersionUID = 2894245724817206533L;
 }
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 6ac7778fe391..6485917ca646 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 = 6700983932433979850L;
+    private static final long serialVersionUID = 6700991632015714874L;
 }
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 6b5675524d9e..84ae8882de43 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 = -1912288223835369644L;
+    private static final long serialVersionUID = -1912285263731267644L;
 }
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 bcd52fc2d541..726e80d78d96 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 = 834023847117701669L;
+    private static final long serialVersionUID = -8922110878097535312L;
 
     /** @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 172906435f48..d5347fa361c1 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 = 1894596500430805808L;
+    private static final long serialVersionUID = 1894596744454002687L;
 
     /** @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 2ff20cac14e7..0e47a1f37853 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 = 2892576080121820597L;
+    private static final long serialVersionUID = 2892576156306664764L;
 
     /** @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 0ed9cec36986..4de18e96df4d 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 = 5787344938986478719L;
+    private static final long serialVersionUID = 5787344694972481712L;
 }
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 f475c18f717a..f952b38d8f39 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 = 4908749019031183599L;
+    private static final long serialVersionUID = 4908749255549986662L;
 }
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 8df3659ce7a8..91b6be3fa481 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
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4322847313405368456L;
+    private static final long serialVersionUID = 4322847552400257095L;
 }
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 35e9da6c21ee..24daa1955a07 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 = 5832345736719300883L;
+    private static final long serialVersionUID = 5832353133039784439L;
 
     /** @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 186c8177594d..7f87323a56ff 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 = 2769376864128394900L;
+    private static final long serialVersionUID = 2769380212887554039L;
 
     /** @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 d04fdb95c40b..8776d7960312 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 = 5344590249486472412L;
+    private static final long serialVersionUID = 5344584341087632632L;
 }
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 ce9a69e6340a..ab6e985d2007 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 = -8399047066444055092L;
+    private static final long serialVersionUID = -8399047684890499537L;
 }
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 074034aa8ba7..08df3bddf02e 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 = -860914776730108078L;
+    private static final long serialVersionUID = -860915395257477002L;
 
     /** @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 14d1482de1c5..ffaebf56e404 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 = 954148688806292020L;
+    private static final long serialVersionUID = 954157327409191575L;
 
     /** @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 9012edfbd9e8..6936b673084f 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 = 6934989973010701693L;
+    private static final long serialVersionUID = 6934986624152089817L;
 }
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 25f7385d376a..fa948a09d4ca 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 = 5414537589442647789L;
+    private static final long serialVersionUID = 5414539530541033358L;
 }
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 9864d8895f0c..4c42b0b69a20 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 = -5190250150000272674L;
+    private static final long serialVersionUID = -5190251475060264863L;
 
     /** @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 fa1c752c2a10..3409d7533469 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 = 8893230282133888495L;
+    private static final long serialVersionUID = 8893231767308311898L;
 
     /** @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 bca9467e8cf4..1043bbcccae3 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 = 888946913958245751L;
+    private static final long serialVersionUID = 2767511738521282301L;
 
     /** @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 ebf506002fd9..cf05cd5ca86e 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 = 4615625800046965754L;
+    private static final long serialVersionUID = 4615629770037321710L;
 
     /** @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 fbef0bb90c77..7078bd83f4b2 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 = 672580578273949093L;
+    private static final long serialVersionUID = 672584548106710529L;
 
     /** @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 45650750fe23..ed441591ccfd 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 = 8654442352573727823L;
+    private static final long serialVersionUID = 8654440867396541672L;
 }
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 8dd6ccf8a24c..38e551ade232 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 = 3694613268974339715L;
+    private static final long serialVersionUID = 3694611783774005796L;
 }
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 6a53d4b70fc8..16e3f8808de3 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 = 2159705535970265597L;
+    private static final long serialVersionUID = 2159709666101811098L;
 }
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 a44019a92ab1..dcf4636ca377 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 = 1241671882581457494L;
+    private static final long serialVersionUID = 1241676012700994659L;
 }
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 5bdd6c9b623e..147efb50b7b5 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 = -4423619341459057522L;
+    private static final long serialVersionUID = 2169972655107949956L;
 }
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 87785dfc6324..cd9336dc24a6 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 = 2970392910548874666L;
+    private static final long serialVersionUID = -900834597875511753L;
 }
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 22bab4c339f3..f566ee15a15e 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 = 7077860792648651371L;
+    private static final long serialVersionUID = -1472731828274416266L;
 
     /** @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 22bdec9b8c04..eea3bc1b81b0 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 = -7449055811607071971L;
+    private static final long serialVersionUID = -4698192106392516736L;
 }
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 86d947d9f537..dc058fd5a87e 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 = 5184109521456763490L;
+    private static final long serialVersionUID = -5921338289760219550L;
 }
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 ab96f8f86d7a..2f0050b07169 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 = -2375286386280584669L;
+    private static final long serialVersionUID = -3802329672607689821L;
 
     /** @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 1a460e73b1cf..e8fb77b07a58 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 = 694385520031220565L;
+    private static final long serialVersionUID = -2119247576846120747L;
 }
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 31a61b7cf202..8cff3aa6f469 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 = -477023764562079400L;
+    private static final long serialVersionUID = -477023661257634287L;
 }
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 2fc92c296220..c3a222833abc 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 = 3485214471353300350L;
+    private static final long serialVersionUID = 3485214243899630391L;
 }
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 eb729c9f9522..d7193804c142 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 = 1717377712034855055L;
+    private static final long serialVersionUID = 1717377939479034182L;
 }
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 d88ae563ed5d..a2c6b482c19a 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 = -7384918679306359210L;
+    private static final long serialVersionUID = -7384918575973461729L;
 }
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 35d9354492d0..f42c83ce1f9a 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 = -2733707216145025005L;
+    private static final long serialVersionUID = -2733707027589524774L;
 }
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 2e712c927021..e9b6e3288441 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 = 4528095955708036698L;
+    private static final long serialVersionUID = 4528096059012481811L;
 }
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 9cd8f9a1bbfb..e6c0a2126a36 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 = -477020025844082087L;
+    private static final long serialVersionUID = -477016800970470273L;
 }
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 03a085459703..6966fcbee767 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 = 3485212739436834303L;
+    private static final long serialVersionUID = 3485210193856471193L;
 }
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 df39937043d8..f0b6cea3ee1a 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 = 1717373622208342798L;
+    private static final long serialVersionUID = 1717371079210704616L;
 }
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 597920873162..4445df9ee57a 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 = -7384913938409087273L;
+    private static final long serialVersionUID = -7384917170865828751L;
 }
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 adaf95d2eecb..a426222e1843 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 = 3424367610981841690L;
+    private static final long serialVersionUID = 3424376298599140604L;
 }
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 1ead4fbe6567..3d324c6fabf2 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 = -1172602365618315957L;
+    private static final long serialVersionUID = -1172593685584007443L;
 }
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 9ac1969e79ca..29a0a845dabc 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 = -1126115809381774926L;
+    private static final long serialVersionUID = -1126107808640575852L;
 }
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 87a53cd70db2..76821eff3d3b 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 = -2097585444559738094L;
+    private static final long serialVersionUID = -2097577438818552076L;
 }
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 a1741c69d59d..db251eb96452 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 = -477017241435789106L;
+    private static final long serialVersionUID = -477024360006035817L;
 }
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 4c5ae927c9cb..2a8ece4ab917 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 = 3485209908675513192L;
+    private static final long serialVersionUID = 3485213705436003121L;
 }
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 0d52e70952c2..46df6f7693e3 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 = 1717370837629294617L;
+    private static final long serialVersionUID = 1717378638094595136L;
 }
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 5f5a2074e46e..c558e9687874 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 = -7384916769303244736L;
+    private static final long serialVersionUID = -7384919114607844199L;
 }
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 72047a57e876..246fe5ce97e8 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 = 3424376095915871757L;
+    private static final long serialVersionUID = 3424382535019830868L;
 }
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 ec668f41ef3c..745c9e900a18 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 = -1172594004814634788L;
+    private static final long serialVersionUID = -1172594306862839035L;
 }
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 7ff11fbf1135..5a8483561680 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 = -1126107324267785563L;
+    private static final long serialVersionUID = -1126112482389616900L;
 }
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 64b03032e0e6..571906eff165 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 = -2097576959606750715L;
+    private static final long serialVersionUID = -2097571202397845412L;
 }
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 2b6228184ec4..d3b4a4c04df5 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 = -5399638967324823520L;
+    private static final long serialVersionUID = -3659552259958227664L;
 
     /** @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 cdce8b42db41..d5bae247a0a3 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 = -4130959833833934100L;
+    private static final long serialVersionUID = 1198828163352299388L;
 }
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 57a5800ccdce..4e7fbc8c8560 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 = -6397004227132787600L;
+    private static final long serialVersionUID = -6396997105857292951L;
 
     /** @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 c08ccb88bc25..f91ee4f75487 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 = -9066881658694724458L;
+    private static final long serialVersionUID = -9066880677307689110L;
 
     /** @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 e23de7fd2791..fc27f5ac34a7 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 = -845484641200676349L;
+    private static final long serialVersionUID = -3419181491028405773L;
 
     /** @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 4e5a924cd41e..77537e87d560 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 = 1389645551735747009L;
+    private static final long serialVersionUID = 2720069541224788017L;
 
     /** @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 4f19fef9c8ea..6f7e753af378 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 = 2659933445428288323L;
+    private static final long serialVersionUID = -2279217159749654951L;
 }
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 1d535fd57b58..afea9fbaeee6 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 = -7655916805713727216L;
+    private static final long serialVersionUID = -7655923888131504325L;
 
     /** @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 8a82e0b1c08b..f2c5e694aba2 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 = -2271135054493217978L;
+    private static final long serialVersionUID = -2271128137344853458L;
 
     /** @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 e14276c08991..58948d0e0a59 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 = 481706667375340301L;
+    private static final long serialVersionUID = 481713788575484541L;
 
     /** @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 f59da03a405e..3eda3fa33664 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 = -4426894544120239952L;
+    private static final long serialVersionUID = -4426887588152645335L;
 
     /** @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 d5ace0c641cd..307e12a27290 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 = 850545923878042192L;
+    private static final long serialVersionUID = 850544588293262048L;
 
     /** @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 41a91945e252..8c51945ae802 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 = -4328903397006418039L;
+    private static final long serialVersionUID = -4328899408630239358L;
 
     /** @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 e26ff5bdd1b5..2432de0898f7 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 = -5081816695161231148L;
+    private static final long serialVersionUID = -5081817875704095297L;
 
     /** @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 3f4d52f61717..0a9eb40ea85c 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 = 643076074875067153L;
+    private static final long serialVersionUID = 643085799673318445L;
 
     /** @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 61770d5de72e..f7ca1871d7d5 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 = -2438007262738356104L;
+    private static final long serialVersionUID = -2438013859527908880L;
 
     /** @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 5a4723d71560..ad3796ca0b9d 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 = 3651522378954868765L;
+    private static final long serialVersionUID = 3651529296053529142L;
 
     /** @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 f0de69cf0eaf..692640f6fc76 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 = 8804373189153545400L;
+    private static final long serialVersionUID = 8804382593619714451L;
 
     /** @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 444277a760d8..3be28467a313 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 = -5353755162817641522L;
+    private static final long serialVersionUID = -5353761924950050267L;
 
     /** @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 8d7547c215ba..ec068b1768e3 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 = -6522130122476732225L;
+    private static final long serialVersionUID = -6522139886169821410L;
 
     /** @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 edb0dd312eb4..c55bdea2c947 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 = 7620289451397288444L;
+    private static final long serialVersionUID = 7620288110805704349L;
 
     /** @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 a54a76ba85d2..7e7f8ce1e220 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 = -3413771217079096924L;
+    private static final long serialVersionUID = 2570755302954425373L;
 }
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 e638fd76b905..3076871283b6 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 = -9183985410458571856L;
+    private static final long serialVersionUID = -2403081030255481619L;
 
     /** @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 f10ecac1be9b..4360ef10474a 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 = -7655207394725292804L;
+    private static final long serialVersionUID = 7476069285293233825L;
 }
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 327ac4b17581..758bb0db3300 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 = -9066881238899294792L;
+    private static final long serialVersionUID = -9066882026851190724L;
 
     /** @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 9b5b9d741e62..e847181aff89 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 = 102755949454302131L;
+    private static final long serialVersionUID = -834220709454675858L;
 
     /** @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 4862a44a63ec..a8d404b7d52b 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 = -8590371607575371696L;
+    private static final long serialVersionUID = -9135261483977302771L;
 
     /** @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 605c912cfe78..337d49abcf90 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 = -2355735514839378317L;
+    private static final long serialVersionUID = 7156076666044445299L;
 
     /** @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 b2ee7c02e908..85a7db050716 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 = -3551065695007412455L;
+    private static final long serialVersionUID = -3083279426182281080L;
 }
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 2c6e780b1637..425e9ac8cb3f 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 = -7655923166122687292L;
+    private static final long serialVersionUID = -7655916928180627584L;
 
     /** @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 b2430ad2f22c..6bf295daffae 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 = -2271128859084485252L;
+    private static final long serialVersionUID = -2271134931566980162L;
 
     /** @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 9a884b9384b6..10002571ebb2 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 = 4147528594779414368L;
+    private static final long serialVersionUID = 4147534832663727811L;
 
     /** @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 e1d48ff93a69..5e820eb44027 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 = 481708895127381167L;
+    private static final long serialVersionUID = 481707120597907532L;
 
     /** @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 70f72abd736e..4787e775b57d 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 = 643079622769226367L;
+    private static final long serialVersionUID = 643076112412125691L;
 
     /** @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 a4194bd10961..1f92c3f8a213 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 = -2438007682628551774L;
+    private static final long serialVersionUID = -2438007065136490720L;
 
     /** @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 88c395b207a1..b407bb25012d 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 = 3611284740460494606L;
+    private static final long serialVersionUID = -5657338413288907776L;
 
     /** @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 f4a15b4a1b37..80c861eab189 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 = -8813709786928305893L;
+    private static final long serialVersionUID = -8813707516532323041L;
 
     /** @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 8b3992a41d3d..0defbc221f2b 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 = 4410691319488191863L;
+    private static final long serialVersionUID = 4410693590045320563L;
 }
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 634694835118..4e65a5b5152f 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 = 3651528574199841892L;
+    private static final long serialVersionUID = 3651522501717914920L;
 
     /** @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 0db4077fd5dd..1648ece593cd 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 = 8804376416605326145L;
+    private static final long serialVersionUID = 8804372906248294541L;
 
     /** @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 4e07d44731f8..8ec85f6d1682 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 = -4989066976298787452L;
+    private static final long serialVersionUID = -4989067764089041336L;
 
     /** @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 57de5f639766..9cbe2e16b9de 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 = -5353761203096362761L;
+    private static final long serialVersionUID = -5353754965144676805L;
 
     /** @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 53d22fb281b8..45a43e1850fc 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 = -6522134992721890228L;
+    private static final long serialVersionUID = -6522130490612074137L;
 
     /** @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 dd02530f5ede..6e104694b313 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 = 7620287388950906319L;
+    private static final long serialVersionUID = 7620289498953841444L;
 
     /** @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 5c7e1403cab1..3c57ccbb8cb6 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 = -876066407619944291L;
+    private static final long serialVersionUID = -7736358562890022627L;
 }
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 eab4326be012..21847fe09781 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 = 8337096128639451097L;
+    private static final long serialVersionUID = 4594177748630349413L;
 
     /** @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 f41b30c534e3..0d5d39f94ad7 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 = 3886860512374485530L;
+    private static final long serialVersionUID = -8061693475878351194L;
 }
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 b72e24953c13..80e9a5b0b34f 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 = 122965253067047107L;
+    private static final long serialVersionUID = 6380990310079989730L;
 
     /** @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 76384bab454f..6a1f36e1b2a0 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 = -4537421837475545713L;
+    private static final long serialVersionUID = -833181361510168146L;
 }
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 913d5c30cf6a..5f8e3ee75a7c 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 = -3201225293213828448L;
+    private static final long serialVersionUID = 675383298411340577L;
 
     /** @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 8f6eda2f7d1d..a1a369c8f21a 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 = -914965564537964861L;
+    private static final long serialVersionUID = -3721539369390950206L;
 
     /** @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 a9791544f010..9b8f4c973a52 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 = 2207975459914308979L;
+    private static final long serialVersionUID = -2648896633594850573L;
 
     /** @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 a791b33048a6..589f8f6caef5 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 = 6042397348590903747L;
+    private static final long serialVersionUID = -2459058807906962855L;
 }
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 c536658606e1..3f39680584d7 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 = -7655923889348949244L;
+    private static final long serialVersionUID = -7655931268942725769L;
 
     /** @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 6a3289dcf78b..48dae754dcf4 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 = -2271128136126337414L;
+    private static final long serialVersionUID = -2271120756415059955L;
 
     /** @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 6a9c2a05085d..4eca7f3d8b80 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 = 4147527871714332558L;
+    private static final long serialVersionUID = 4147520492101606849L;
 
     /** @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 ebd446caec0d..d09a600271ce 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 = 481713789791761793L;
+    private static final long serialVersionUID = 481716997799473742L;
 
     /** @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 a20d35f6c5af..b4d44a97787f 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 = 643085803476389643L;
+    private static final long serialVersionUID = 643087725443881166L;
 
     /** @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 8fb5187b6415..56aea4b429f3 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 = -2438013860771161503L;
+    private static final long serialVersionUID = -2438005195266884363L;
 
     /** @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 0cf227091377..623429020f5f 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 = -2213104560729459070L;
+    private static final long serialVersionUID = 7900347739982967253L;
 
     /** @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 738ebc08bbd3..a6fc54a44f55 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 = -8813709066405256913L;
+    private static final long serialVersionUID = -8813712274290988054L;
 
     /** @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 e7b542629f6a..63c68db01529 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 = 4410692040285450524L;
+    private static final long serialVersionUID = 4410699422308076914L;
 }
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 8b5d494e2760..c99c8a339514 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 = 3651529297271820595L;
+    private static final long serialVersionUID = 3651536676863631358L;
 
     /** @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 e7021fb91a2f..7448b9874503 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 = 8804382597420514966L;
+    private static final long serialVersionUID = 8804373929243487451L;
 
     /** @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 a5a10b165ac1..6c022ca90285 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 = -4989060803075441965L;
+    private static final long serialVersionUID = -4989058873634997986L;
 
     /** @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 64a13d27936d..b7cdb73fd677 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 = -5353761926158296800L;
+    private static final long serialVersionUID = -5353758715741477267L;
 
     /** @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 a10536374146..baf8868cace9 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 = -6522139889882883882L;
+    private static final long serialVersionUID = -6522143095392024140L;
 
     /** @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 8f662f0b9afd..e96a6d7c623f 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 = 7620288114687136213L;
+    private static final long serialVersionUID = 7620284901583719415L;
 
     /** @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 fc35163418c2..74e366b3f5cf 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 = -6746968231407452497L;
+    private static final long serialVersionUID = -2159977161171659281L;
 }
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 8a90003671cb..f4524fe72ccb 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 = 6096749649997296708L;
+    private static final long serialVersionUID = -1975000050203691849L;
 
     /** @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 990793f9a671..5bb55e45db15 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 = 2850513687666429788L;
+    private static final long serialVersionUID = -7531866147916106554L;
 }
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 c46d19171e5e..88eed3c546d6 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 = 2625913025379343586L;
+    private static final long serialVersionUID = -8074629338267702858L;
 }
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 87773211bf83..1e8a1f63b303 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 = -3105767160561585743L;
+    private static final long serialVersionUID = 2031148934084202790L;
 
     /** @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 12b84a7d62e9..fd74d55db81f 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 = 5734225800573903207L;
+    private static final long serialVersionUID = 5734225756762823297L;
 }
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 051bfa7fe8bf..10576c3410e7 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 = 8304784331717655004L;
+    private static final long serialVersionUID = 8240653970558951105L;
 
     /** @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 63d44b4d9414..f8b739bc9292 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 = 7808535197740002672L;
+    private static final long serialVersionUID = 5957869419843538480L;
 }
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 fdde6c24d852..bec94b67adfd 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 = 8225915286329919769L;
+    private static final long serialVersionUID = 8967508450606017480L;
 
     /** @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 fb67ff6cbaf3..5d9e7c806812 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 = -1374866804262480945L;
+    private static final long serialVersionUID = -3093926128096366530L;
 }
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 056a0404f92b..e2d47ad42428 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 = -7700228328336254420L;
+    private static final long serialVersionUID = -3310718121077397332L;
 }
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 361434797305..73c5c2d9764b 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 = -943493208143627868L;
+    private static final long serialVersionUID = -943480757004126008L;
 }
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 8ebb225312b7..22454bcee127 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 = 5686132495893159486L;
+    private static final long serialVersionUID = -5310885451215925592L;
 
     /** @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 44dc5c37f7aa..529a3b446a7b 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 = -2944654555028774561L;
+    private static final long serialVersionUID = -2944655780557769293L;
 }
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 221063189b22..caa3aa432eb0 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 = 1321766199473424055L;
+    private static final long serialVersionUID = -1892161654534534089L;
 }
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 05831145c896..fa21f6972521 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 = 1592251841658995550L;
+    private static final long serialVersionUID = -764051854870792674L;
 
     /** @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 663a5c3ed10a..c0836e323098 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 = 3320867593119313296L;
+    private static final long serialVersionUID = -756154760435685490L;
 
     /** @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 6872a30cb604..5b03a89d738a 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 = 1839074041010047807L;
+    private static final long serialVersionUID = -7273029413880526849L;
 
     /** @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 55f649b830a6..574a9049fdbd 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 = -3172283053371547691L;
+    private static final long serialVersionUID = -3172273564854523688L;
 
     /** @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 bb8102a1d8e9..6a08f1822997 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 = -5542853803697395024L;
+    private static final long serialVersionUID = -5542866451107399491L;
 }
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 c1d52faa6710..eca6d6fd6735 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 = -4586466974911695849L;
+    private static final long serialVersionUID = 1573324340908442039L;
 }
diff --git a/slice2java/js/test/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/Glacier2/router/Test/CallbackException.java
index 478e94cf04cb..ad7ae4f712ca 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 = 7950928943421923764L;
+    private static final long serialVersionUID = 7839096915362031412L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Base.java b/slice2java/js/test/Ice/defaultValue/Test/Base.java
index 8db4ab446105..0c49d4e90f42 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 = 6023706352282506759L;
+    private static final long serialVersionUID = -3542370857168502713L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java
index e3e430f41e5d..e5857522b446 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 = 1820774701255923123L;
+    private static final long serialVersionUID = 2581914953188692211L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 190aebc86fd9..774098b286dd 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 = 84007943260507513L;
+    private static final long serialVersionUID = -2171375069227357703L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 93849a4e2d77..d65504d0ffba 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 = 3956068760006547775L;
+    private static final long serialVersionUID = -8943121582976833991L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/Ice/defaultValue/Test/Derived.java
index 4a60cc81d172..3f0e6120ea21 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 = -1602704841420973355L;
+    private static final long serialVersionUID = -7650302239020707243L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java
index fc1aacb97d06..97ab24508393 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 = 905040977168577634L;
+    private static final long serialVersionUID = 7805389416130550498L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index 9df47d2ac64d..4b9d6a06926b 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 = -3531097019316276643L;
+    private static final long serialVersionUID = -198737322348540451L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index 7e09ef448f7c..847608560408 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 = 1905794586684153039L;
+    private static final long serialVersionUID = 7453348317410322889L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java
index fb2c39b9bc0f..11e947c06a9e 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 = 5127391628646341626L;
+    private static final long serialVersionUID = 5127388981141740156L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java
index 81aaad025d62..4638759d52b7 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 = 6883382832121049234L;
+    private static final long serialVersionUID = -2845945003345595374L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java
index 16ae7a5ae469..2612fb79c888 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 = -5653775550001832622L;
+    private static final long serialVersionUID = 1153860433015433618L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java
index 51a867d24094..5bd98a3db687 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 = -3070809235638504560L;
+    private static final long serialVersionUID = -1085266963151935728L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java
index 89f614c452bf..4264c1d54be4 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 = -2708089518774132120L;
+    private static final long serialVersionUID = -6503544876323866130L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/A.java b/slice2java/js/test/Ice/exceptions/Test/A.java
index a0a06e9bd202..88a574f87a6e 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 = 7823746586488826509L;
+    private static final long serialVersionUID = 7823741787390802836L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/B.java b/slice2java/js/test/Ice/exceptions/Test/B.java
index 0be7c07e257b..15fb13019cf6 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 = -3861409312023328307L;
+    private static final long serialVersionUID = -3861419400978752940L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/C.java b/slice2java/js/test/Ice/exceptions/Test/C.java
index dc11d1b373c5..e237f07330b8 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 = 1080700277691611789L;
+    private static final long serialVersionUID = 1080695478593588116L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/D.java b/slice2java/js/test/Ice/exceptions/Test/D.java
index 6ae73eb748a6..663ebb5eda72 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 = 4780382956078749901L;
+    private static final long serialVersionUID = 4780372867123325268L;
 }
diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/Ice/inheritance/Test/MC/A.java
index c18aa6036b77..fea5c97d2c91 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 = 954223160202455519L;
+    private static final long serialVersionUID = 954230002513257320L;
 
     /** @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 74fcf581b8bb..163820fdb876 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 = 1339631045303996101L;
+    private static final long serialVersionUID = 1339643303950961138L;
 
     /** @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 06a7ce5c8bb5..e0c12745b046 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 = -2729314696304782009L;
+    private static final long serialVersionUID = -2729307892818522384L;
 
     /** @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 1bac5f9442c2..bc6ecf00d207 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 = -3435400803680054335L;
+    private static final long serialVersionUID = -3435399465676477706L;
 
     /** @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 7376799bcb61..403fb0487f56 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 = -836179047271194024L;
+    private static final long serialVersionUID = -836185850453997393L;
 
     /** @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 33ff83b744da..ab145684f2b6 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 = 1132525468126654693L;
+    private static final long serialVersionUID = 1132526651144456850L;
 
     /** @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 bda9f25fc8ca..43347b0b8733 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 = -6335557913636090521L;
+    private static final long serialVersionUID = -6335551275457591664L;
 
     /** @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 6cace7f6a588..e2a8bd8876aa 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 = -4007406884475935519L;
+    private static final long serialVersionUID = -4007416622101521770L;
 
     /** @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 13981f131550..296a077f5f84 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 = 991428074110193753L;
+    private static final long serialVersionUID = 991429450938312558L;
 
     /** @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 7405fc1a3901..d1b838ad9f2e 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 = -2880342356985512699L;
+    private static final long serialVersionUID = -2880329933030647630L;
 
     /** @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 bb719f63a3c7..98af279b1d36 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 = -8808270403666312057L;
+    private static final long serialVersionUID = -8808263434872152400L;
 
     /** @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 55cde9bfd007..abd0c613e7e1 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 = -771861005412117759L;
+    private static final long serialVersionUID = -771859502100641098L;
 
     /** @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 3fcbe87a2ffb..46054c1ba70a 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 = 6566362128884660442L;
+    private static final long serialVersionUID = 6566349870541151661L;
 
     /** @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 8bb6d81052f0..8c00acde7f02 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 = 6983796928094305573L;
+    private static final long serialVersionUID = 6983809186437814354L;
 
     /** @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 011953910bad..f813b22d47bd 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 = -1175216637710729305L;
+    private static final long serialVersionUID = -1175220744849328048L;
 
     /** @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 3155567b79d3..8cf79e55f3fe 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 = -3279720637525261279L;
+    private static final long serialVersionUID = -3279719299825140906L;
 
     /** @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 c1ac9f7e3e12..e12ec4ed6621 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 = -4359177919574612773L;
+    private static final long serialVersionUID = -4359181997907199380L;
 
     /** @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 cc6d3e5f54ba..3a2c45dbb90d 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 = 5904687832855384133L;
+    private static final long serialVersionUID = 5904700091502349170L;
 
     /** @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 64594ef211e2..32554984c9e2 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 = 1835742091246606023L;
+    private static final long serialVersionUID = 1835748894732865648L;
 
     /** @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 8a9878dc9bd4..eeead41e3494 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 = -2252401456910371519L;
+    private static final long serialVersionUID = -2252400118906794890L;
 
     /** @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 57920c8b32c7..4e9d8e33e94b 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 = -1203537810540674732L;
+    private static final long serialVersionUID = -1203533693080089693L;
 
     /** @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 a93680270ca3..7501c4f83990 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 = -7537766563460630427L;
+    private static final long serialVersionUID = -7537765380442828270L;
 
     /** @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 5fb1ea0b32b0..84215eef8a10 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 = 3440894128486175975L;
+    private static final long serialVersionUID = 3440900766664674832L;
 
     /** @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 b5060519a1c2..e98b9b9b37f0 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 = 9151102598428036193L;
+    private static final long serialVersionUID = 9151092860802449942L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/A.java b/slice2java/js/test/Ice/objects/Test/A.java
index bc21a35403f2..ca72a3456ab6 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 = 667083886654700953L;
+    private static final long serialVersionUID = -5844179153221170925L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/A1.java b/slice2java/js/test/Ice/objects/Test/A1.java
index fad8a1a813ce..56339c79965b 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 = -5926742053737667382L;
+    private static final long serialVersionUID = -5926739164788017203L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/B.java b/slice2java/js/test/Ice/objects/Test/B.java
index 909c3dad8895..2c7f71062a88 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 = -8890919995849168423L;
+    private static final long serialVersionUID = -8890911656846401243L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/B1.java b/slice2java/js/test/Ice/objects/Test/B1.java
index 2273d773f2e7..fc14aa9191ed 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 = 3505215850725493060L;
+    private static final long serialVersionUID = 2851031460095794308L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Base.java b/slice2java/js/test/Ice/objects/Test/Base.java
index 9d13509d2df8..b9de6c196ca5 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 = -7170418509110503945L;
+    private static final long serialVersionUID = 1552880232823987615L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/C.java b/slice2java/js/test/Ice/objects/Test/C.java
index 6316ba0e7b1d..4e94ddba0156 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 = -3869187632444611512L;
+    private static final long serialVersionUID = -9118773589635397012L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/COneMember.java b/slice2java/js/test/Ice/objects/Test/COneMember.java
index 9e3ee764499d..24e89a2e449d 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 = 3050973231470397510L;
+    private static final long serialVersionUID = 3050964887366871106L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java
index cd04acade833..0ee53af15d7c 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 = -6326234082004855909L;
+    private static final long serialVersionUID = -8516344380331558501L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/D.java b/slice2java/js/test/Ice/objects/Test/D.java
index 70dad3a809f0..0ae47f11bd1a 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 = -463259500800580028L;
+    private static final long serialVersionUID = -6066445631542029134L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/D1.java b/slice2java/js/test/Ice/objects/Test/D1.java
index 6f75ce6f248f..ebe885995412 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 = -2078503531663052157L;
+    private static final long serialVersionUID = 6908628887729379395L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/E.java b/slice2java/js/test/Ice/objects/Test/E.java
index 4a5bd25ee50d..e49b582cd78c 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 = -2968794950708028526L;
+    private static final long serialVersionUID = -6919556650388552332L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/EBase.java b/slice2java/js/test/Ice/objects/Test/EBase.java
index dc879b71cb26..0de28c87a53a 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 = 5617943843210738702L;
+    private static final long serialVersionUID = 7999084737166057550L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/EDerived.java b/slice2java/js/test/Ice/objects/Test/EDerived.java
index 9282a6575af3..dd8be21068bd 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 = -5090022515064568814L;
+    private static final long serialVersionUID = -2258245951345447214L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/EOneMember.java b/slice2java/js/test/Ice/objects/Test/EOneMember.java
index 20af2a67072d..91f3299a3a01 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 = -6225288413854236215L;
+    private static final long serialVersionUID = -6225280069750709811L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java
index 6aeaec2f30c4..23a1c5a0dcf9 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 = -8557564061875895020L;
+    private static final long serialVersionUID = -6367453763549192428L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/F.java b/slice2java/js/test/Ice/objects/Test/F.java
index 905f3e2cb280..7a1fb9ba3d0a 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 = -7331502762439425455L;
+    private static final long serialVersionUID = 5701021142562722577L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/F1.java b/slice2java/js/test/Ice/objects/Test/F1.java
index 1a641b1e3d4b..035fe956c5cc 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 = 6192372079861078006L;
+    private static final long serialVersionUID = 6192372784852738762L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/F3.java b/slice2java/js/test/Ice/objects/Test/F3.java
index f7c7c276efaf..d8eed7b5967f 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 = 7671669571567275510L;
+    private static final long serialVersionUID = -1271826405066298397L;
 
     /** @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 fccd22baff0b..e07d07404312 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 = -1425257007583467533L;
+    private static final long serialVersionUID = -1425254118736101169L;
 
     /** @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 680d4fdc3e97..7513f49fd330 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 = -2337227815108676493L;
+    private static final long serialVersionUID = -2337224923599647628L;
 }
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 557c4edd6dbd..fb341fdf527e 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 = -1298680531554467290L;
+    private static final long serialVersionUID = -1298688878185402604L;
 
     /** @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 5e5b5999ada9..3afbbcfdc6ac 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 = 1842234359324436887L;
+    private static final long serialVersionUID = 1842226015214081296L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/K.java b/slice2java/js/test/Ice/objects/Test/K.java
index 0165407e5950..7f62e5178099 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 = 4645163294493961558L;
+    private static final long serialVersionUID = 4645160410484425872L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/L.java b/slice2java/js/test/Ice/objects/Test/L.java
index b6a104345b9f..ececcc0653a1 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 = 6629735015875637249L;
+    private static final long serialVersionUID = 6629743357540645382L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/M.java b/slice2java/js/test/Ice/objects/Test/M.java
index d13024bb27b2..02ad501b089a 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 = -8088093177799152474L;
+    private static final long serialVersionUID = -8088101519392752765L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Recursive.java b/slice2java/js/test/Ice/objects/Test/Recursive.java
index 16f6d18a0a28..8ed320e2fa6a 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 = 3617879059298504458L;
+    private static final long serialVersionUID = 3617887405908086863L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/S.java b/slice2java/js/test/Ice/objects/Test/S.java
index bdfb0f6c2159..e84fbebb465d 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 = 481770516186170290L;
+    private static final long serialVersionUID = 481773400112137013L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/SOneMember.java b/slice2java/js/test/Ice/objects/Test/SOneMember.java
index 477132be4571..dbe5c2a9f497 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 = 6227757447623355103L;
+    private static final long serialVersionUID = 6227749105951522139L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/Ice/objects/Test/STwoMembers.java
index 4c919eda115a..fcbbb5a533f4 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 = -3678014921652226942L;
+    private static final long serialVersionUID = 5854911489125127298L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/StructKey.java b/slice2java/js/test/Ice/objects/Test/StructKey.java
index e53e1282725c..20b792a4345f 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 = -4639712876321803426L;
+    private static final long serialVersionUID = -1518790495529397192L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java
index 567e7c5cb9de..00198b3122cf 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 = 2723850380767761989L;
+    private static final long serialVersionUID = 2723849475376712697L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/MyClass1.java b/slice2java/js/test/Ice/operations/Test/MyClass1.java
index 7982d576ce6a..d61b6ac9d74b 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 = -7515946409558115281L;
+    private static final long serialVersionUID = -8756758913222150531L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct.java b/slice2java/js/test/Ice/operations/Test/MyStruct.java
index 01c9cc97deaf..6df067d5d421 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 = -2793298496446446691L;
+    private static final long serialVersionUID = -8286282524414552611L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/Ice/operations/Test/MyStruct1.java
index 814b7e9d7c5d..c36c3dc46cae 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 = 4512580603215206118L;
+    private static final long serialVersionUID = -4724631857075201932L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/Structure.java b/slice2java/js/test/Ice/operations/Test/Structure.java
index eaa03400d4c2..e85d981e41aa 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 = 4718439256293806719L;
+    private static final long serialVersionUID = -8721775599789391765L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/A.java b/slice2java/js/test/Ice/optional/Test/A.java
index a80fa28448e2..ff954e42754e 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 = -6818159395745417328L;
+    private static final long serialVersionUID = 7402546166292069648L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/B.java b/slice2java/js/test/Ice/optional/Test/B.java
index 49ab25d1024b..eba739e3f19d 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 = 5392076672280407587L;
+    private static final long serialVersionUID = 3010941287460413667L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/C.java b/slice2java/js/test/Ice/optional/Test/C.java
index 68b4836c13f8..89022e31c6e6 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 = 7162174493358660093L;
+    private static final long serialVersionUID = -8758522781122753539L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/DerivedException.java b/slice2java/js/test/Ice/optional/Test/DerivedException.java
index cf058161cab9..2ad0c1699cad 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 = 2724969352340007362L;
+    private static final long serialVersionUID = 2423918984512264198L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/E.java b/slice2java/js/test/Ice/optional/Test/E.java
index a2b0f945589d..51bd711151b4 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 = -1850739531394862013L;
+    private static final long serialVersionUID = -1850730302348347338L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/F.java b/slice2java/js/test/Ice/optional/Test/F.java
index 931224629fef..b421422d9350 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 = -6430492753772393936L;
+    private static final long serialVersionUID = -6430490752199371579L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/Ice/optional/Test/FixedStruct.java
index b60e6a699dc0..ec56f614e091 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 = 1569601291436280910L;
+    private static final long serialVersionUID = 1569617093681132259L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/G.java b/slice2java/js/test/Ice/optional/Test/G.java
index 13a23a35be0e..ffb543bbd76a 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 = 5793720423974777491L;
+    private static final long serialVersionUID = 8090185558736558163L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/G1.java b/slice2java/js/test/Ice/optional/Test/G1.java
index fe2c3f982c52..23e1d28263df 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 = 7339784696318736460L;
+    private static final long serialVersionUID = 7339779959274190728L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/G2.java b/slice2java/js/test/Ice/optional/Test/G2.java
index b618881a6f44..008180d85759 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 = 3824551081950867743L;
+    private static final long serialVersionUID = 3824560310981164434L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/Ice/optional/Test/MultiOptional.java
index b4af0264545f..b8b99f1ef834 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 = -4839631557096023034L;
+    private static final long serialVersionUID = -3894830627472767318L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/OneOptional.java b/slice2java/js/test/Ice/optional/Test/OneOptional.java
index 9b29647ec562..9d3287d30a70 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 = -7219599136126473888L;
+    private static final long serialVersionUID = -7219605469481200755L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/OptionalException.java b/slice2java/js/test/Ice/optional/Test/OptionalException.java
index b2a39e0cb71d..2fbde6a2f54f 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 = -4463891100527029827L;
+    private static final long serialVersionUID = 7469851267084813568L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java
index 156a8e03b95c..5345021045eb 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 = -6465470325936508229L;
+    private static final long serialVersionUID = -3371174942073888517L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/RequiredException.java b/slice2java/js/test/Ice/optional/Test/RequiredException.java
index 1f59c88dbba0..268738e07120 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 = 2894238632111070853L;
+    private static final long serialVersionUID = 2894242080240873409L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/Ice/optional/Test/SmallStruct.java
index 3a0db62ff649..5e5906c56691 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 = 6700987824901187057L;
+    private static final long serialVersionUID = 6700995441845820948L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/VarStruct.java b/slice2java/js/test/Ice/optional/Test/VarStruct.java
index bc818307c0c0..2eb73e145832 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 = -1912284171265424956L;
+    private static final long serialVersionUID = -1912288908309970688L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/WD.java b/slice2java/js/test/Ice/optional/Test/WD.java
index f82f5fb16432..b33ceacab3a8 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 = -6371937352844796948L;
+    private static final long serialVersionUID = 3233345217371120101L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C.java b/slice2java/js/test/Ice/scope/Test/C.java
index fa572ce8d816..3075e0762c08 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 = -5190251456820839152L;
+    private static final long serialVersionUID = -5190248642795079407L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C1.java b/slice2java/js/test/Ice/scope/Test/C1.java
index 41ac84209d8d..62050ddd5311 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 = 8893231754234397548L;
+    private static final long serialVersionUID = 8893234560677166893L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C2.java b/slice2java/js/test/Ice/scope/Test/C2.java
index 3a31884bb3b4..ac8c76c53847 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 = 7760374506500928127L;
+    private static final long serialVersionUID = -2683450471121847490L;
 
     /** @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 be4a26229d1c..73b5199a2229 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 = 4615629749257039981L;
+    private static final long serialVersionUID = 4615626937809470444L;
 
     /** @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 3e1d08a0f6fd..0dd57e9d8562 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 = 672584692637817984L;
+    private static final long serialVersionUID = 672592791509209153L;
 
     /** @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 3d0b728f656e..dd55f39aa80b 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 = 8654440880472912247L;
+    private static final long serialVersionUID = 8654438074030142646L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/Inner/S.java b/slice2java/js/test/Ice/scope/Test/Inner/S.java
index 4a7fd1733494..61a1198c6d42 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 = 3694611962153840955L;
+    private static final long serialVersionUID = 3694620066032473722L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S.java b/slice2java/js/test/Ice/scope/Test/S.java
index 715a59db93c9..166ace93fba0 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 = 2159709485138900613L;
+    private static final long serialVersionUID = 2159701383838604100L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S1.java b/slice2java/js/test/Ice/scope/Test/S1.java
index 7ad149e5e9c1..8eff4d90e524 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 = 1241676035944932053L;
+    private static final long serialVersionUID = 1241678844966037396L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S2.java b/slice2java/js/test/Ice/scope/Test/S2.java
index 5cb1025089c1..425c5ec6ad0f 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 = -5747164666077247738L;
+    private static final long serialVersionUID = -1784096186630334265L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java
index 24fd99e64845..9aeb62a1094a 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 = -477019589184917104L;
+    private static final long serialVersionUID = -477016881038788637L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 01de0c162ae8..b550054078d6 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 = 3485212855645774774L;
+    private static final long serialVersionUID = 3485210273929897861L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index e6cd687e7f48..b4736c1d3d4b 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 = 1717373867406316999L;
+    private static final long serialVersionUID = 1717371159278449012L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 454d8b3c1854..05ea0499cf93 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 = -7384914509062012130L;
+    private static final long serialVersionUID = -7384917090796428051L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java
index e901dfe61e28..1f30f5d062ab 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 = -2733711060764904357L;
+    private static final long serialVersionUID = -2733702897476546584L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
index aedb487d6a80..673c457a4a5d 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 = 4528100125924210194L;
+    private static final long serialVersionUID = 4528108454538796001L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/B.java b/slice2java/js/test/Ice/slicing/objects/Test/B.java
index 040e56c6d4f8..fff1cc5a2b27 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 = 348314713499471567L;
+    private static final long serialVersionUID = 1107102555568876505L;
 
     /** @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 d90de76c29fc..4311192a3378 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 = 4162014663118325635L;
+    private static final long serialVersionUID = -3015057205566236907L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java
index f93eef7d9652..606952e4a8c3 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 = -6396997081359819197L;
+    private static final long serialVersionUID = -6396997450727179543L;
 
     /** @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 5d6da2767975..f16c1312f626 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 = -9066880784302018096L;
+    private static final long serialVersionUID = -9066880332441994656L;
 
     /** @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 ddd9a439d00d..fa220d759604 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 = -3453450506484897876L;
+    private static final long serialVersionUID = -774403260065926854L;
 
     /** @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 08d818dcc47a..320befee1c2f 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 = 3077884580688099438L;
+    private static final long serialVersionUID = 5364847772343665016L;
 
     /** @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 861a8ef611eb..e502f24f7b13 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 = -4340463153595423438L;
+    private static final long serialVersionUID = -1972676364074742659L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java
index 1d959237b524..65f78255aae4 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 = -7655923951336362428L;
+    private static final long serialVersionUID = -7655923582130041743L;
 
     /** @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 d98fc95d1d80..f50b110958e7 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 = -2271127908722235140L;
+    private static final long serialVersionUID = -2271128278082201248L;
 
     /** @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 a89847f01e05..67e1f17a314d 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 = 481713813049446079L;
+    private static final long serialVersionUID = 481713443778999044L;
 
     /** @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 b062375e4b22..07d181b25671 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 = -4426887398347132157L;
+    private static final long serialVersionUID = -4426887767710031959L;
 
     /** @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 807676cafa13..62cc53ab812a 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 = 850544729283881250L;
+    private static final long serialVersionUID = 850544602621284697L;
 
     /** @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 99ce7697d46a..12a7673d49a0 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 = -4328899632248175979L;
+    private static final long serialVersionUID = -4328899268027045870L;
 
     /** @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 ed0473acddce..637b0b7a9059 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 = -5081817900008255666L;
+    private static final long serialVersionUID = -5081818016409431038L;
 
     /** @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 da9aa8184fe6..8f2536a14764 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 = 643085780187963095L;
+    private static final long serialVersionUID = 643085658939525031L;
 
     /** @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 5c28615c1407..709dbaa5782c 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 = -2438013757547394381L;
+    private static final long serialVersionUID = -2438014039065862996L;
 
     /** @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 8c92f6c143f4..5164a252478b 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 = 3651529524715946887L;
+    private static final long serialVersionUID = 3651529155367095371L;
 
     /** @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 1c1d23f4d29c..8fac2b9a9aa2 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 = 8804382574163468322L;
+    private static final long serialVersionUID = 8804382773222008814L;
 
     /** @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 b064f421131e..827f3177134e 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 = -5353761988152351788L;
+    private static final long serialVersionUID = -5353761939230138216L;
 
     /** @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 4d81dd2d3953..bbe7d5bad4f4 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 = -6522139827994948539L;
+    private static final long serialVersionUID = -6522139706533466920L;
 
     /** @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 2c5a4149c51e..82d3e8d7420f 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 = 7620287926034968134L;
+    private static final long serialVersionUID = 7620288125138902491L;
 
     /** @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 005c1b886381..992acbe463e7 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 = -8567107355769166102L;
+    private static final long serialVersionUID = -1115353358062218020L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/LargeStruct.java b/slice2java/js/test/Ice/stream/Test/LargeStruct.java
index 10942874cf39..497453fe7df4 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 = -6288828471237106395L;
+    private static final long serialVersionUID = 7251756357354351392L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/MyClass.java b/slice2java/js/test/Ice/stream/Test/MyClass.java
index 5284f9e4ad9c..c1a31c41e87c 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 = 5814545545282809547L;
+    private static final long serialVersionUID = 5749563249270210530L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/stream/Test/MyException.java b/slice2java/js/test/Ice/stream/Test/MyException.java
index a4c416645558..64645a07ea11 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 = 5734225398921736441L;
+    private static final long serialVersionUID = 5734224558130572585L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/Ice/stream/Test/OptionalClass.java
index 1dbc77e0a8e8..0c6244403342 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 = -3326200073871213543L;
+    private static final long serialVersionUID = 7518512433392440805L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/Clash/Cls.java b/slice2java/js/test/Slice/escape/Clash/Cls.java
index bd05fafa15d5..cccc5945e3ad 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 = -8496021363120400666L;
+    private static final long serialVersionUID = -5751865826365960320L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/Clash/Ex.java b/slice2java/js/test/Slice/escape/Clash/Ex.java
index f6dbbf8aaf19..fc82e39131f8 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 = 4297289012313984319L;
+    private static final long serialVersionUID = -8180549704782895463L;
 }
diff --git a/slice2java/js/test/Slice/escape/Clash/St.java b/slice2java/js/test/Slice/escape/Clash/St.java
index 0242c3e68826..ae3dfd920cce 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 = -4430186883210060187L;
+    private static final long serialVersionUID = -479296718843269467L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/BaseMethods.java b/slice2java/js/test/Slice/escape/await/BaseMethods.java
index 8b410eb39076..ac6ed7d340e3 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 = 8872918817939764380L;
+    private static final long serialVersionUID = -2396875044585991739L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/_break.java b/slice2java/js/test/Slice/escape/await/_break.java
index b975626a651f..d0787bd6cc8b 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 = 1765541284510330185L;
+    private static final long serialVersionUID = 5485402932098222288L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/_package.java b/slice2java/js/test/Slice/escape/await/_package.java
index bb2b4f07b1de..5c0540a96d9d 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 = -8029664082069927298L;
+    private static final long serialVersionUID = 1181044727830269249L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/await/delete.java b/slice2java/js/test/Slice/escape/await/delete.java
index a17bd68a9720..214bd268fdbd 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 = 1423816329228426359L;
+    private static final long serialVersionUID = 7640340946374231724L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/await/fixed.java b/slice2java/js/test/Slice/escape/await/fixed.java
index 12c31c46ef01..9d55cbbe3c59 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 = 3808662285704954215L;
+    private static final long serialVersionUID = 3808655743147145342L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/foreach.java b/slice2java/js/test/Slice/escape/await/foreach.java
index 7c4448f185db..e83a6472db52 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 = -8132036644423546103L;
+    private static final long serialVersionUID = -1215223413060382647L;
 }
diff --git a/slice2java/js/test/Slice/macros/Test/Default.java b/slice2java/js/test/Slice/macros/Test/Default.java
index 3c96b744edf4..e3113dde30fd 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 = -4916406843796953154L;
+    private static final long serialVersionUID = -5398410759840362562L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/macros/Test/NoDefault.java b/slice2java/js/test/Slice/macros/Test/NoDefault.java
index b6896713b415..1792a2ff9f37 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 = -1545467997341120289L;
+    private static final long serialVersionUID = -5334295313773544865L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java
index dac7058e3852..b48c97005ee3 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 = 5762784264380323051L;
+    private static final long serialVersionUID = 6406031169695371591L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java
index c34d35910f0f..8f57f2c82d97 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 = 4796756685235500820L;
+    private static final long serialVersionUID = -5746695192587206215L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index d106dc67d0d6..82e375a0ff25 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 = 2462636203541794031L;
+    private static final long serialVersionUID = 5348488770861635718L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java
index 3ade6b6bba9b..97f56da6e0f6 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 = -324062685673421133L;
+    private static final long serialVersionUID = -1168675544945497203L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java
index 46b15a281db5..16943374a4f0 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 = 5127387578605312130L;
+    private static final long serialVersionUID = 5127391552278332023L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java
index a92898958aba..648edda1af90 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 = -4222378040051771048L;
+    private static final long serialVersionUID = 7849268340364395818L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java
index 52c5d3c1e77d..9644b78536d1 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 = -3935372707176274486L;
+    private static final long serialVersionUID = 9144235000976793113L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java
index ff246345828f..3d91489371c8 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 = -3960451984921414110L;
+    private static final long serialVersionUID = 6443168998737828777L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/A.java b/slice2java/matlab/test/Ice/exceptions/Test/A.java
index 135bd0dd180c..9bf4f8440b83 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 = 7823741835252919756L;
+    private static final long serialVersionUID = 7823745080580152363L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/B.java b/slice2java/matlab/test/Ice/exceptions/Test/B.java
index 2f1dd9eb0ea4..fd8906d24599 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 = -3861419353116496884L;
+    private static final long serialVersionUID = -3861410652775900309L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/C.java b/slice2java/matlab/test/Ice/exceptions/Test/C.java
index 9974c8064aa9..e0364372d82c 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 = 1080695526455705036L;
+    private static final long serialVersionUID = 1080698771782937643L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/D.java b/slice2java/matlab/test/Ice/exceptions/Test/D.java
index e7728c910b37..2f9d3e5251fe 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 = 4780372914985581324L;
+    private static final long serialVersionUID = 4780381615326177899L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/E.java b/slice2java/matlab/test/Ice/exceptions/Test/E.java
index 83aaa3a4a240..eb5ed22862c8 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 = -1876978149479146622L;
+    private static final long serialVersionUID = -1876968092467509208L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/F.java b/slice2java/matlab/test/Ice/exceptions/Test/F.java
index 3128a5233dc2..a90a7626cb77 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 = 733478712595714945L;
+    private static final long serialVersionUID = 733475472339929707L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java
index f7224622882f..16e4369563e9 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 = -4641407442254210472L;
+    private static final long serialVersionUID = -4641413745924092737L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java
index 43d864bbcb01..6fb74de21aa5 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 = -8471299014494307502L;
+    private static final long serialVersionUID = -8471296328380371378L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java
index 878f576257af..450ddf29fc1f 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 = 8898655843524309162L;
+    private static final long serialVersionUID = 8898658777729765953L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java
index 8773a4343cb4..51864a866a25 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 = 4040524609857780924L;
+    private static final long serialVersionUID = 4040516143046169036L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java
index 5b651035252e..2d5014a6486d 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 = 5383252859228844763L;
+    private static final long serialVersionUID = 5383244314658778779L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java
index aee05c3a1d75..6b09feede3b5 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 = 4057360014456091660L;
+    private static final long serialVersionUID = 4057357245794945138L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java
index cb77c7e487e5..2669b114bbe9 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 = -1044057045789319325L;
+    private static final long serialVersionUID = -1044059897448127254L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java
index b196a4907bc5..074547daeea2 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 = -1862555197017390007L;
+    private static final long serialVersionUID = -1862557965714781007L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java
index 1b137fcb0f48..5e4e12ee2a9d 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 = -2187166031851000230L;
+    private static final long serialVersionUID = -2187168883465077028L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java
index 75f6d957281e..47a11c91d0cf 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 = 9197047912738975323L;
+    private static final long serialVersionUID = 5082100251014330793L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java
index b6ac33a1907b..9735bf2ad999 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 = -5145823804990734861L;
+    private static final long serialVersionUID = -5145815503576796326L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java
index f557da00322b..50e38c0e8690 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 = 3347993997443044050L;
+    private static final long serialVersionUID = 3347996761207646073L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java
index 8283f2e296e4..3fedc3448ec1 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 = -9162151403305733338L;
+    private static final long serialVersionUID = -9162154254774155178L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java
index 3b62fd847de0..ffa322d27898 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 = -2752865108986264729L;
+    private static final long serialVersionUID = -2752862262375182553L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java
index 00439863a605..f327f2177e05 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 = -6601221325310285674L;
+    private static final long serialVersionUID = -6601229709314052632L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java
index 8408acb545f3..f1739f05e10e 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 = 3216398366187762203L;
+    private static final long serialVersionUID = 3216395685190610066L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java
index df0f4c1583e8..a8e122d01e75 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 = -3218147241874978413L;
+    private static final long serialVersionUID = -3218155625993741717L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java
index 4857d72ee4da..c764ddc3a9e4 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 = 4560076926541435822L;
+    private static final long serialVersionUID = 4560085475969942312L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java
index a4f573e64427..4b04eff3e988 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 = -8638281006300851981L;
+    private static final long serialVersionUID = -557477287301189773L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/A.java b/slice2java/matlab/test/Ice/objects/Test/A.java
index cc5601f74fe9..6275c8430f74 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 = -8597427182794168291L;
+    private static final long serialVersionUID = 169572733885483089L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/A1.java b/slice2java/matlab/test/Ice/objects/Test/A1.java
index 7809198473d9..083bdb56963c 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 = -5926737159067264764L;
+    private static final long serialVersionUID = -5926746063653557638L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/B.java b/slice2java/matlab/test/Ice/objects/Test/B.java
index b4b1fde3d104..ff8fcf6900bf 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 = -8890913662472676596L;
+    private static final long serialVersionUID = -8890918716014971822L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/B1.java b/slice2java/matlab/test/Ice/objects/Test/B1.java
index 311543716826..15beee89b455 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 = -7653712691506510204L;
+    private static final long serialVersionUID = -3913063428013287676L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Base.java b/slice2java/matlab/test/Ice/objects/Test/Base.java
index dd0427aad7b2..cff44877cc31 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 = 6051352134845224138L;
+    private static final long serialVersionUID = 8183507169315055428L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/C.java b/slice2java/matlab/test/Ice/objects/Test/C.java
index f3d5e1cc8b42..30e68adde892 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 = 8376772315103013753L;
+    private static final long serialVersionUID = -7292553054632336198L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/COneMember.java b/slice2java/matlab/test/Ice/objects/Test/COneMember.java
index 278e5e503348..bba8b117235a 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 = 3050966892940959402L;
+    private static final long serialVersionUID = 3050977406866530319L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java
index e93c8b974e88..098628d04cd2 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 = 8522395700812456475L;
+    private static final long serialVersionUID = 2146854025665740251L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/D.java b/slice2java/matlab/test/Ice/objects/Test/D.java
index 9f2355919eeb..c7d33cc6cba8 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 = 5838409042056389173L;
+    private static final long serialVersionUID = -9064179382765840665L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/D1.java b/slice2java/matlab/test/Ice/objects/Test/D1.java
index 4ba70912319c..179d4150702d 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 = -9189326509977383229L;
+    private static final long serialVersionUID = 8145808438585326531L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/E.java b/slice2java/matlab/test/Ice/objects/Test/E.java
index 99a9f6639e2e..87b66884d811 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 = 2291794519806060133L;
+    private static final long serialVersionUID = -6714416850525066397L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/EBase.java b/slice2java/matlab/test/Ice/objects/Test/EBase.java
index cef0b196d49d..8c781d0e25a7 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 = -9002864684165726898L;
+    private static final long serialVersionUID = 5775766606393187022L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/EDerived.java b/slice2java/matlab/test/Ice/objects/Test/EDerived.java
index d3404671b225..80462f517765 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 = -2881148364734011566L;
+    private static final long serialVersionUID = -1809050600357567662L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java
index 7d782688ed7d..230e6cdf98c7 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 = -6225277903731493147L;
+    private static final long serialVersionUID = -6225292423790671360L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java
index 1004f6936e2d..ccfff373fe5f 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 = -8907548732697961836L;
+    private static final long serialVersionUID = -2921437925490025516L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/F.java b/slice2java/matlab/test/Ice/objects/Test/F.java
index 10e390a9e364..a29fb6a0cbdf 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 = -2130914458759239983L;
+    private static final long serialVersionUID = -4480923277181144111L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/F1.java b/slice2java/matlab/test/Ice/objects/Test/F1.java
index 08a06090a605..ba39638ae965 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 = 6192372666178073344L;
+    private static final long serialVersionUID = 6192372812053726250L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/F3.java b/slice2java/matlab/test/Ice/objects/Test/F3.java
index d01658e0ae05..cf2945b83570 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 = -7335630263801201984L;
+    private static final long serialVersionUID = 5054576716605278644L;
 
     /** @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 806d7f9b80c2..2894316e25ca 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 = -1425250829349160794L;
+    private static final long serialVersionUID = -1425261017601645960L;
 
     /** @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 c8700a3b7cd4..94268a1fdc34 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 = -2337227089453368131L;
+    private static final long serialVersionUID = -2337229260344431037L;
 }
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 09d13d5457ee..a6be6da2a8a9 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 = -1298691043921875793L;
+    private static final long serialVersionUID = -1298679251583873819L;
 
     /** @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 67269ebeeb7e..023edfd5bbb5 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 = 1842229304511718617L;
+    private static final long serialVersionUID = 1842238534699746407L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/K.java b/slice2java/matlab/test/Ice/objects/Test/K.java
index fd330c28eaee..ba9295f99b90 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 = 4645163859924572426L;
+    private static final long serialVersionUID = 4645161849345228802L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/L.java b/slice2java/matlab/test/Ice/objects/Test/L.java
index 17806c66acf4..6dbb85f2729c 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 = 6629740068261836239L;
+    private static final long serialVersionUID = 6629739191260179441L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/M.java b/slice2java/matlab/test/Ice/objects/Test/M.java
index 440331d247b1..ed1be5435510 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 = -8088104968828251917L;
+    private static final long serialVersionUID = -8088097187799939505L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Recursive.java b/slice2java/matlab/test/Ice/objects/Test/Recursive.java
index b1572a7cfb0e..89b0e903af60 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 = 3617890855340365833L;
+    private static final long serialVersionUID = 3617877614140653706L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/S.java b/slice2java/matlab/test/Ice/objects/Test/S.java
index 3f086e2a1d40..449390e0cb70 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 = 481776689418976380L;
+    private static final long serialVersionUID = 481771795952436802L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java
index 3bbb72200b10..9de07b79553e 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 = 6227746939931387251L;
+    private static final long serialVersionUID = 6227753437696119830L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java
index 747982f4724d..a7bbe97ca8f5 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 = -501767709449948926L;
+    private static final long serialVersionUID = -3752599570508788926L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/StructKey.java b/slice2java/matlab/test/Ice/objects/Test/StructKey.java
index 2f7565e7745e..c6e7500cc01b 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 = -5367535764214333015L;
+    private static final long serialVersionUID = -2642480380635936849L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java
index 46986231afa4..d343e22bad22 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 = 2723847737060826303L;
+    private static final long serialVersionUID = 2723843104641833283L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java
index 4fb1a63ef24b..f10613d68549 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 = 787965469367171405L;
+    private static final long serialVersionUID = 7849830520128490223L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java
index 0ec870c0fcb4..2ba2abcc857c 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 = -474305666312193475L;
+    private static final long serialVersionUID = 4796901836791691261L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java
index fd73d7e12f45..880cb9cc887f 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 = 6156263800023992772L;
+    private static final long serialVersionUID = 2881655889811246694L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/Structure.java b/slice2java/matlab/test/Ice/operations/Test/Structure.java
index 4ac4aee8b227..ee8e0467c712 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 = -3243863181421167398L;
+    private static final long serialVersionUID = -5702476998061128351L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/A.java b/slice2java/matlab/test/Ice/optional/Test/A.java
index 78c6cf0537e8..af308522349a 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 = 1795088539818353808L;
+    private static final long serialVersionUID = 7318931569937367312L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/B.java b/slice2java/matlab/test/Ice/optional/Test/B.java
index 61287b0a9caa..16e1520649e7 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 = 6424557239113593443L;
+    private static final long serialVersionUID = -876118733462428573L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/C.java b/slice2java/matlab/test/Ice/optional/Test/C.java
index 78faec642295..e8dfd728289b 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 = 1875343524957522045L;
+    private static final long serialVersionUID = -8614206608724303107L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java
index ce90affa9745..c6e49dc9d526 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 = -3543365053113109371L;
+    private static final long serialVersionUID = 5258390105828125347L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/E.java b/slice2java/matlab/test/Ice/optional/Test/E.java
index 67806a616904..bb2606493c6a 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 = -1850731066895099053L;
+    private static final long serialVersionUID = -1850744144396355135L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/F.java b/slice2java/matlab/test/Ice/optional/Test/F.java
index 5b4e7d2ece57..1175cdae6522 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 = -6430489992657341536L;
+    private static final long serialVersionUID = -6430499056092433358L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java
index 60f3edd1a84f..e683b8260512 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 = 1569609595417102245L;
+    private static final long serialVersionUID = 1569603422199715499L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/G.java b/slice2java/matlab/test/Ice/optional/Test/G.java
index 3f627c892361..5a4b9a159b47 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 = -2726212358719975661L;
+    private static final long serialVersionUID = 3075970254472783123L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/G1.java b/slice2java/matlab/test/Ice/optional/Test/G1.java
index c004a94e4d39..3adcf2c8bbda 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 = 7339787457541209995L;
+    private static final long serialVersionUID = 7339782565508258989L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/G2.java b/slice2java/matlab/test/Ice/optional/Test/G2.java
index 7624043eecd3..fb9594223f8c 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 = 3824559546431812194L;
+    private static final long serialVersionUID = 3824546468942308218L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java
index 324df5c049af..955c471c659d 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 = 2525880824705978664L;
+    private static final long serialVersionUID = 5172593511475455579L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java
index c818603114fa..b1ae1bdd692e 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 = -7219607357452092981L;
+    private static final long serialVersionUID = -7219602625670651195L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java
index 641cb725686b..3d12890a8e2d 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 = 5434603086340185987L;
+    private static final long serialVersionUID = 2980157145406203634L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java
index f3a0ad3e5e3b..0bb6a9245232 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 = 94661082032523387L;
+    private static final long serialVersionUID = 5361147261613549307L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java
index f0e2b5973a6f..642af7ec5842 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 = 2894241480847194050L;
+    private static final long serialVersionUID = 2894244774292252196L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java
index 9551c2ddc66f..764077a82e01 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 = 6700996041242198399L;
+    private static final long serialVersionUID = 6700981682686517873L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java
index 0068d10758c4..aab835cf64d7 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 = -1912281410042951421L;
+    private static final long serialVersionUID = -1912286302075902427L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/WD.java b/slice2java/matlab/test/Ice/optional/Test/WD.java
index 1ce33afe3983..daeac1184eb8 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 = 5358345449669125216L;
+    private static final long serialVersionUID = 9169334540390320648L;
 
     /** @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 f4f25fae6023..13e187085c4a 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 = -477016695075881650L;
+    private static final long serialVersionUID = -477024445243014850L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java
index 3060afc019fb..850efac07882 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 = -8435640742128138614L;
+    private static final long serialVersionUID = -8435642706527970310L;
 
     /** @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 5d4b3263aaa4..2b19cea4817e 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 = 3485210294750790120L;
+    private static final long serialVersionUID = 3485213790672931160L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index eb26c2d39188..99a73ada68f5 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 = 1717370973316255257L;
+    private static final long serialVersionUID = 1717378392715650985L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 155ccd2a8ac2..817b69b2f7d9 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 = -7384917064971240128L;
+    private static final long serialVersionUID = -7384919359986872144L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java
index a6d8b5618819..32e28feccead 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 = -2733703044542542971L;
+    private static final long serialVersionUID = -2733696986504488651L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
index e049b1974008..6233c88347e4 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 = 4528108480364270412L;
+    private static final long serialVersionUID = 4528106185348638396L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java
index 3ac6b912e52c..07490b32b995 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 = 6137362265615432519L;
+    private static final long serialVersionUID = 6137369685022945783L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java
index 4434fc8db33f..38183efc19b8 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 = 751749944196150375L;
+    private static final long serialVersionUID = 751746779036064279L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java
index 845909921f9a..8295c4722c5d 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 = -4272727560005121164L;
+    private static final long serialVersionUID = -4272722702721638716L;
 
     /** @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 efb2530043bc..0b7f6d5f132b 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 = 7648648894970527457L;
+    private static final long serialVersionUID = -5989026378508063263L;
 
     /** @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 58a72a4d21d7..e4574c5380e1 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 = -534745780979202643L;
+    private static final long serialVersionUID = -5078155733357710163L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 2dfe2ada2eea..aaa6f83ccf35 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 = -6397006209458257787L;
+    private static final long serialVersionUID = -6396993957262466667L;
 
     /** @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 d2c070684eec..5cfaf8de3aaa 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 = -9066879673791281607L;
+    private static final long serialVersionUID = -9066889281060672215L;
 
     /** @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 7ef368ba3c4b..fca1f57e4505 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 = 19424253468712706L;
+    private static final long serialVersionUID = 1944517359432041858L;
 
     /** @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 51d8b090c6d6..189c30cef1cf 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 = 6550765121105280704L;
+    private static final long serialVersionUID = 8475852771907908800L;
 
     /** @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 05ba172ef8f3..1eed76390269 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 = 5931528457300472113L;
+    private static final long serialVersionUID = 4626783131101627953L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java
index d8ee5252944f..1d3c7679803b 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 = -7655918955928981151L;
+    private static final long serialVersionUID = -7655931169265595279L;
 
     /** @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 a156f80220ad..ff9614973589 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 = -2271133069428259710L;
+    private static final long serialVersionUID = -2271120690748028398L;
 
     /** @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 99f44e565970..3a9f4a2e3bb3 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 = 481704685047669418L;
+    private static final long serialVersionUID = 481716937243460538L;
 
     /** @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 476b9d420f2f..17aae5fb9479 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 = -4426891236597508795L;
+    private static final long serialVersionUID = -4426878819093817643L;
 
     /** @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 ee0b396ce680..c4f120a5bd64 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 = 850542621513905079L;
+    private static final long serialVersionUID = 850535824478815015L;
 
     /** @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 fd217decd30b..f16d83f428e1 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 = -4328899931841483852L;
+    private static final long serialVersionUID = -4328906855325329756L;
 
     /** @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 6034fe869e0e..294df905f665 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 = -5081814707668320530L;
+    private static final long serialVersionUID = -5081810429110875138L;
 
     /** @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 0a632769ed50..5c808dbc51f0 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 = 643078057361102206L;
+    private static final long serialVersionUID = 643087791116015342L;
 
     /** @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 909dfbd44ac3..461c21593ad1 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 = -2438003792558404096L;
+    private static final long serialVersionUID = -2438005260881516144L;
 
     /** @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 8c16699f7ffd..b0a5013bfe13 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 = 3651524364020604135L;
+    private static final long serialVersionUID = 3651536742665151095L;
 
     /** @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 e40312a5292a..a97af67891df 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 = 8804375171641156034L;
+    private static final long serialVersionUID = 8804373995037900370L;
 
     /** @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 2c3e222af80a..b0ac63c49c3c 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 = -5353757313192129548L;
+    private static final long serialVersionUID = -5353758616207374364L;
 
     /** @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 d80766e2a994..0ca4f8a068f8 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 = -6522133427411431876L;
+    private static final long serialVersionUID = -6522143199989837652L;
 
     /** @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 3d5adff66726..62f31c49be82 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 = 7620286144022259455L;
+    private static final long serialVersionUID = 7620284802146755311L;
 
     /** @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 263b955550a8..b05bed4ec045 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 = -5964839715947065764L;
+    private static final long serialVersionUID = -9107064758563080868L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java
index cac88bec60dc..bc1d00d27bb2 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 = 1880928349317418605L;
+    private static final long serialVersionUID = -6933671463972933075L;
 
     /** @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 2c21926cc937..a880f7875d7a 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 = 8028668454738132916L;
+    private static final long serialVersionUID = 3433788960768680749L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java
index ae83f5bd0ebc..55c60669cc8c 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 = 2421484697222435290L;
+    private static final long serialVersionUID = 2421489470380465196L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java
index 49795852eafa..9282d372e5be 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 = 8712284597989649317L;
+    private static final long serialVersionUID = 5533331997177327383L;
 
     /** @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 14eda5ff0de6..65df8fd9adcd 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 = 2795540092496825274L;
+    private static final long serialVersionUID = 1487598435889835761L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java
index b3de3b00d970..071341f0c49a 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 = -5778642530932675688L;
+    private static final long serialVersionUID = -7542398735250072457L;
 
     /** @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 cf82482cdda2..b375ae55ad18 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 = -1008955353909761797L;
+    private static final long serialVersionUID = -1008950578171098099L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/exceptions/Test/A.java b/slice2java/php/test/Ice/exceptions/Test/A.java
index d3684b94ac83..9a8f2aae7bcc 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 = 7823746565677836250L;
+    private static final long serialVersionUID = 7823737025767824221L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/B.java b/slice2java/php/test/Ice/exceptions/Test/B.java
index fcae84480870..655c600e798b 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 = -3861409167526140006L;
+    private static final long serialVersionUID = -3861418707588089315L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/C.java b/slice2java/php/test/Ice/exceptions/Test/C.java
index eb97ec34d2d7..18da0d8ded1d 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 = 1080700256880621530L;
+    private static final long serialVersionUID = 1080690716970609501L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/D.java b/slice2java/php/test/Ice/exceptions/Test/D.java
index 7659cbe8f320..4e564c05a7ca 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 = 4780383100575938202L;
+    private static final long serialVersionUID = 4780373560513988893L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/A.java b/slice2java/php/test/Ice/objects/Test/A.java
index 2357b2310279..02be87035643 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 = 4023214575510517139L;
+    private static final long serialVersionUID = 1693245380960948627L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/A1.java b/slice2java/php/test/Ice/objects/Test/A1.java
index 0051f6f32c7b..b4aebf8b9746 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 = -5926745722724936031L;
+    private static final long serialVersionUID = -5926743950968449717L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/B.java b/slice2java/php/test/Ice/objects/Test/B.java
index 4d87984e13a1..8f82430e7ab3 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 = -8890919056961893367L;
+    private static final long serialVersionUID = -8890915125729361629L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/B1.java b/slice2java/php/test/Ice/objects/Test/B1.java
index c3d2089e3c35..a4f84f68fbd1 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 = 3775416811030740100L;
+    private static final long serialVersionUID = -7555964647112243452L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/Base.java b/slice2java/php/test/Ice/objects/Test/Base.java
index 3f60d4ac7b1b..6bf99dae48bb 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 = -5303368796365410017L;
+    private static final long serialVersionUID = -4826933112720921761L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/C.java b/slice2java/php/test/Ice/objects/Test/C.java
index 693a37615d15..10231aeaa35d 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 = 2754040579348603456L;
+    private static final long serialVersionUID = 1720144604479695786L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/COneMember.java b/slice2java/php/test/Ice/objects/Test/COneMember.java
index 32cf9673f36c..6afdeb499ed0 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 = 3050977747809604879L;
+    private static final long serialVersionUID = 3050979431727299813L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java
index dc5d4759e709..5cdfa77df388 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 = -6085173894398706213L;
+    private static final long serialVersionUID = 7860484032783649563L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/D.java b/slice2java/php/test/Ice/objects/Test/D.java
index 24ac30cb9308..1974ca735d7a 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 = -4210256427329700834L;
+    private static final long serialVersionUID = -6263670158218755724L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/D1.java b/slice2java/php/test/Ice/objects/Test/D1.java
index 3136a7c31a53..339c35856663 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 = 7895040620514670403L;
+    private static final long serialVersionUID = -4525785479203916989L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/E.java b/slice2java/php/test/Ice/objects/Test/E.java
index f877516a1cce..a7b6e03ecae1 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 = 2019803767991788020L;
+    private static final long serialVersionUID = -7399734055535162188L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/EBase.java b/slice2java/php/test/Ice/objects/Test/EBase.java
index 45ca98d8ae62..b4f352536d6f 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 = 6050394149550166606L;
+    private static final long serialVersionUID = 5304463677465316302L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/EDerived.java b/slice2java/php/test/Ice/objects/Test/EDerived.java
index c2039a639ca5..9435742eeaf9 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 = -31638267492663342L;
+    private static final long serialVersionUID = -2762963366116732590L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/EOneMember.java b/slice2java/php/test/Ice/objects/Test/EOneMember.java
index 02b7551f7e1c..474e178db308 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 = -6225292764733745920L;
+    private static final long serialVersionUID = -6225290481413777238L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java
index fa12d093b638..b006db43bb1d 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 = 5310589994574420948L;
+    private static final long serialVersionUID = -3180193230570286700L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/F.java b/slice2java/php/test/Ice/objects/Test/F.java
index ef9a75044fd4..55679c53837c 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 = -1305957310694116399L;
+    private static final long serialVersionUID = 3765784639148685841L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/F1.java b/slice2java/php/test/Ice/objects/Test/F1.java
index e792a309ff0f..69d0a1076e15 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 = 6192369175280074812L;
+    private static final long serialVersionUID = 6192372669985324781L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/F3.java b/slice2java/php/test/Ice/objects/Test/F3.java
index 89141cf834c9..584ae388c853 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 = 3824949692080859062L;
+    private static final long serialVersionUID = -5050223625658993546L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/K.java b/slice2java/php/test/Ice/objects/Test/K.java
index fdc8fdd01ce9..a19d1e259b88 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 = 4645162190289365983L;
+    private static final long serialVersionUID = 4645159906817599285L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/L.java b/slice2java/php/test/Ice/objects/Test/L.java
index 47900d832c65..633adadfe603 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 = 6629738850331664170L;
+    private static final long serialVersionUID = 6629735755960319232L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/Recursive.java b/slice2java/php/test/Ice/objects/Test/Recursive.java
index ca5db40aa353..ebfc06fcb447 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 = 3617877273198958340L;
+    private static final long serialVersionUID = 3617875671626599790L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/S.java b/slice2java/php/test/Ice/objects/Test/S.java
index f979d433f9a8..edd7e0f375c5 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 = 481771455023947801L;
+    private static final long serialVersionUID = 481769936394904755L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/SOneMember.java b/slice2java/php/test/Ice/objects/Test/SOneMember.java
index fa8f7ad4d2ed..732f0f9cd2d4 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 = 6227753096744124182L;
+    private static final long serialVersionUID = 6227751252219380796L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/STwoMembers.java b/slice2java/php/test/Ice/objects/Test/STwoMembers.java
index fbc99a66c0a4..8d6e71b8b382 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 = -5634695557599179966L;
+    private static final long serialVersionUID = 4082238699685577986L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java
index 1fcd293ba12b..2019158637d9 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 = 2723841331373369120L;
+    private static final long serialVersionUID = 2723849475376788231L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/MyClass1.java b/slice2java/php/test/Ice/operations/Test/MyClass1.java
index c2b2a83cde46..997ee8cac8d6 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 = 7761642245318836923L;
+    private static final long serialVersionUID = -802500332461219773L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/operations/Test/MyStruct1.java b/slice2java/php/test/Ice/operations/Test/MyStruct1.java
index f2a357ee813b..3ca6c8399845 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 = 7781512838245042002L;
+    private static final long serialVersionUID = -3873175855301382262L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/Structure.java b/slice2java/php/test/Ice/operations/Test/Structure.java
index a85cde02231d..6d90fd7e05c9 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 = 832753946063733579L;
+    private static final long serialVersionUID = 5931074292849533097L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/A.java b/slice2java/php/test/Ice/optional/Test/A.java
index 1337a33a469e..cc6bde820878 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 = -7202087179283749744L;
+    private static final long serialVersionUID = 6816683077717840656L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/B.java b/slice2java/php/test/Ice/optional/Test/B.java
index c73ae00fc020..87fb83d8e91e 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 = -5378294177820343453L;
+    private static final long serialVersionUID = -7066984360646289949L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/C.java b/slice2java/php/test/Ice/optional/Test/C.java
index 9e3e22f80c9c..6cba2856951f 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 = -5045621878271409539L;
+    private static final long serialVersionUID = 3790404927489467389L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/DerivedException.java b/slice2java/php/test/Ice/optional/Test/DerivedException.java
index 8c38a1860889..c5381b2933a0 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 = 8384154894357649859L;
+    private static final long serialVersionUID = -6273691616326194367L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/E.java b/slice2java/php/test/Ice/optional/Test/E.java
index 25f8259961f7..9cd362789547 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 = -1850739409787529067L;
+    private static final long serialVersionUID = -1850744184206531933L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/F.java b/slice2java/php/test/Ice/optional/Test/F.java
index 411bd49e3027..59eb7d764448 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 = -6430492880389344666L;
+    private static final long serialVersionUID = -6430499016282252336L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/FixedStruct.java b/slice2java/php/test/Ice/optional/Test/FixedStruct.java
index b42041ec0e98..2966169063c9 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 = 1569601252519941863L;
+    private static final long serialVersionUID = 1569603216782634377L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/G.java b/slice2java/php/test/Ice/optional/Test/G.java
index 712692f763ff..0dc8c802701d 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 = 4330089897980641427L;
+    private static final long serialVersionUID = 1838221872533945555L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/G1.java b/slice2java/php/test/Ice/optional/Test/G1.java
index b58a6e53f490..84267ecfac7d 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 = 7339784569809620685L;
+    private static final long serialVersionUID = 7339782605624266191L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/G2.java b/slice2java/php/test/Ice/optional/Test/G2.java
index c9424f6b3f39..f4c18d764598 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 = 3824551203548721444L;
+    private static final long serialVersionUID = 3824546429129968666L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/MultiOptional.java b/slice2java/php/test/Ice/optional/Test/MultiOptional.java
index c1f03b7120df..9b2dbc1ac1e4 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 = -4999107482604919419L;
+    private static final long serialVersionUID = -7592348346765324421L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/OneOptional.java b/slice2java/php/test/Ice/optional/Test/OneOptional.java
index db9195fdf5af..60f634caea52 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 = -7219599014554932599L;
+    private static final long serialVersionUID = -7219602505485854041L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/OptionalException.java b/slice2java/php/test/Ice/optional/Test/OptionalException.java
index 3ff9839fa55b..20213fe22737 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 = 7136143003490923909L;
+    private static final long serialVersionUID = -5686733540024396400L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java
index abde3c778848..9c39492b3a13 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 = -322230138098890885L;
+    private static final long serialVersionUID = 1826335553731139643L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/RequiredException.java b/slice2java/php/test/Ice/optional/Test/RequiredException.java
index 13619e54f57e..8b00c14157ff 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 = 2894238593115604484L;
+    private static final long serialVersionUID = 2894244729019721222L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/SmallStruct.java b/slice2java/php/test/Ice/optional/Test/SmallStruct.java
index 1a4d48870951..f5df63e26c7d 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 = 6700987698345177145L;
+    private static final long serialVersionUID = 6700981562501862033L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/VarStruct.java b/slice2java/php/test/Ice/optional/Test/VarStruct.java
index 028944797d4d..f2bdf485f985 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 = -1912284297774540731L;
+    private static final long serialVersionUID = -1912286261959895225L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/WD.java b/slice2java/php/test/Ice/optional/Test/WD.java
index 1bd1dc65d2c3..3635a544e6c3 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 = -6343324446402674396L;
+    private static final long serialVersionUID = 8292218487813376136L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C.java b/slice2java/php/test/Ice/scope/Test/C.java
index c7432b634f48..091df2c2584a 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 = -5190251338148669905L;
+    private static final long serialVersionUID = -5190243959916047804L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C1.java b/slice2java/php/test/Ice/scope/Test/C1.java
index f1ab79792f3e..180fc1219c05 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 = 8893231619941398216L;
+    private static final long serialVersionUID = 8893235157337951800L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C2.java b/slice2java/php/test/Ice/scope/Test/C2.java
index e1c2f80386d5..15c9fd5b8358 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 = -8456945753765228699L;
+    private static final long serialVersionUID = -1143306109390751829L;
 
     /** @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 828f9d728419..f37ba004dbeb 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 = 4615629878421137819L;
+    private static final long serialVersionUID = 4615627707328952249L;
 
     /** @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 d72163e9966a..0bb50448fa7c 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 = 672584811627871896L;
+    private static final long serialVersionUID = 672588095857337940L;
 
     /** @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 98ce04b0b8dd..03b8d1cd37d0 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 = 8654440683999120438L;
+    private static final long serialVersionUID = 8654437477369645219L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/Inner/S.java b/slice2java/php/test/Ice/scope/Test/Inner/S.java
index c45915fc70f3..94efc8e4dbcf 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 = 3694612085992271610L;
+    private static final long serialVersionUID = 3694614003897931247L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S.java b/slice2java/php/test/Ice/scope/Test/S.java
index 4efb72e92f0e..8138052fc6b9 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 = 2159709609262392132L;
+    private static final long serialVersionUID = 2159701988234109521L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S1.java b/slice2java/php/test/Ice/scope/Test/S1.java
index 542048420b6b..60a0f51853a5 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 = 1241676149745368817L;
+    private static final long serialVersionUID = 1241683532850010625L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S2.java b/slice2java/php/test/Ice/scope/Test/S2.java
index ce9089630bfd..1c0ce6c92724 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 = 6587919647842698524L;
+    private static final long serialVersionUID = 5333561323416742098L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java
index 45572a230612..bc1b1fa66bd6 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 = -477023924716739564L;
+    private static final long serialVersionUID = -477023236445024282L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java
index acf844800e98..a1ea8fbbbfa8 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 = 3485214631501810610L;
+    private static final long serialVersionUID = 3485209688982668160L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 8b1bdf48c2e8..540e21de3370 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 = 1717377872188941251L;
+    private static final long serialVersionUID = 1717377514684684657L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index fe24ee246a0e..55e4eee660dc 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 = -7384918519152675046L;
+    private static final long serialVersionUID = -7384912215578230552L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/B.java b/slice2java/php/test/Ice/slicing/objects/Test/B.java
index c39d4eede3c1..9d5bf00f3430 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 = 2287226448792609243L;
+    private static final long serialVersionUID = -5069038323198165642L;
 
     /** @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 a715ae826449..e77f9449980f 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 = -2354354005397767913L;
+    private static final long serialVersionUID = -4685310858087293254L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 615b5367035c..2aea42c50212 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 = -6397005968182023774L;
+    private static final long serialVersionUID = -6397001816072219086L;
 
     /** @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 40853f96fffb..0099a00cdc05 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 = -9066888437703879955L;
+    private static final long serialVersionUID = -9066879981126266577L;
 
     /** @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 65162f85fd05..a9c5afbe0549 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 = 935440707230880536L;
+    private static final long serialVersionUID = 4209889468669125173L;
 
     /** @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 a0ba913fb517..b04c45e28530 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 = -3576030551417902479L;
+    private static final long serialVersionUID = -2998907576582693775L;
 
     /** @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 60306d457dc8..7557f895f404 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 = 2495247958432207261L;
+    private static final long serialVersionUID = -6022166657265245614L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java
index 5426519b14cf..589a17f1d814 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 = -7655927038097902144L;
+    private static final long serialVersionUID = -7655918974144745200L;
 
     /** @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 9dad9ade3444..562407233490 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 = -2271124987412521676L;
+    private static final long serialVersionUID = -2271132885999000388L;
 
     /** @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 04803e26b04e..12405343691e 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 = 481712767050084489L;
+    private static final long serialVersionUID = 481704741928001550L;
 
     /** @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 942587090446..dc59ca503c07 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 = -4426890995013218462L;
+    private static final long serialVersionUID = -4426887008211313806L;
 
     /** @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 ca8130694c66..87999ce65aad 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 = 850542540165278370L;
+    private static final long serialVersionUID = 850538553327722162L;
 
     /** @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 fd3810112777..916b2299adba 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 = -4328900168284430953L;
+    private static final long serialVersionUID = -4328898661101059577L;
 
     /** @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 f98e9550d73c..646b582fac51 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 = -5081814468654476325L;
+    private static final long serialVersionUID = -5081818620799965365L;
 
     /** @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 b9a67a664f92..0d30f373645d 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 = 643086139375670314L;
+    private static final long serialVersionUID = 643078160565809640L;
 
     /** @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 e38a1e96cfe9..77e387df88e8 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 = -2438000643959862920L;
+    private static final long serialVersionUID = -2438003645392581824L;
 
     /** @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 6646cf3b9cd6..524784a1f834 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 = 3651533127903873604L;
+    private static final long serialVersionUID = 3651524547399372338L;
 
     /** @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 e97f50b1b32c..d4719c60c1de 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 = 8804372704918468321L;
+    private static final long serialVersionUID = 8804375274797029527L;
 
     /** @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 d4b635257c76..574f0aa5749e 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 = -5353754164611661289L;
+    private static final long serialVersionUID = -5353757331138651615L;
 
     /** @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 49896d4d4e5e..6ca409185e2b 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 = -6522141509423338027L;
+    private static final long serialVersionUID = -6522133569687181772L;
 
     /** @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 893e64a8d8b3..e8451880019e 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 = 7620283677322637270L;
+    private static final long serialVersionUID = 7620286081829165047L;
 
     /** @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 cc5095d10dc8..30a841a64d22 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 = -4009492408571948964L;
+    private static final long serialVersionUID = -6653174647698764129L;
 }
diff --git a/slice2java/php/test/Slice/escape/Clash/Cls.java b/slice2java/php/test/Slice/escape/Clash/Cls.java
index 0fed9e8f5a62..d3f7a0e0cba4 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 = -4082049096746459458L;
+    private static final long serialVersionUID = 3957060279171569689L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/escape/Clash/Ex.java b/slice2java/php/test/Slice/escape/Clash/Ex.java
index 12b9b2961fc9..1b2311ce57d4 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 = -7621443300595975018L;
+    private static final long serialVersionUID = 2731617085807114975L;
 }
diff --git a/slice2java/php/test/Slice/escape/Clash/St.java b/slice2java/php/test/Slice/escape/Clash/St.java
index 701ab5e1d8c5..4e71509ffbb2 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 = -8436725922977108797L;
+    private static final long serialVersionUID = 5366128754843273635L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/echo.java b/slice2java/php/test/Slice/escape/and/echo.java
index 495f54854548..409c38327124 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 = 5229014604634769728L;
+    private static final long serialVersionUID = -2126302095131128640L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/escape/and/endif.java b/slice2java/php/test/Slice/escape/and/endif.java
index 894606f03e0f..428738e19857 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 = -3766558502521265287L;
+    private static final long serialVersionUID = -3766565737338639915L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/endwhile.java b/slice2java/php/test/Slice/escape/and/endwhile.java
index 32a86e880d63..e2176f124d21 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 = 644702163159848622L;
+    private static final long serialVersionUID = -8372332963965256978L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/xor.java b/slice2java/php/test/Slice/escape/and/xor.java
index dc1c9abdca4a..efdf62b9854a 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 = 1609733877174563514L;
+    private static final long serialVersionUID = -95169408985559914L;
 }
diff --git a/slice2java/php/test/Slice/macros/Test/Default.java b/slice2java/php/test/Slice/macros/Test/Default.java
index 92a8f9d3cfdb..fc1f5b8e162d 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 = -5692129602168068770L;
+    private static final long serialVersionUID = 5685338373691570686L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/macros/Test/NoDefault.java b/slice2java/php/test/Slice/macros/Test/NoDefault.java
index b932a90a33f2..51d0fcdb9641 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 = -2968471391462347073L;
+    private static final long serialVersionUID = -6565422605194989537L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/structure/Test/C.java b/slice2java/php/test/Slice/structure/Test/C.java
index 2f0e08085b69..bdbde0395e60 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 = -3172281349675611885L;
+    private static final long serialVersionUID = -3172282874994667567L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/structure/Test/S1.java b/slice2java/php/test/Slice/structure/Test/S1.java
index 8d6482b07077..0300acb6a9b4 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 = -5542858030747901544L;
+    private static final long serialVersionUID = -5542853775292305547L;
 }
diff --git a/slice2java/php/test/Slice/structure/Test/S2.java b/slice2java/php/test/Slice/structure/Test/S2.java
index b4bd4c90a595..a34ea6ecce08 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 = 6427675390333167582L;
+    private static final long serialVersionUID = -4540907398677316977L;
 }
diff --git a/slice2java/python/test/Glacier2/router/Test/CallbackException.java b/slice2java/python/test/Glacier2/router/Test/CallbackException.java
index b016db3cb168..4db4652e7b60 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 = -3271479978553633937L;
+    private static final long serialVersionUID = -1606424270963560012L;
 }
diff --git a/slice2java/python/test/Ice/custom/Test/C.java b/slice2java/python/test/Ice/custom/Test/C.java
index 6c3f236eda8e..c5986246ce0d 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 = -7760022496089773673L;
+    private static final long serialVersionUID = -8258983449078856553L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/custom/Test/D.java b/slice2java/python/test/Ice/custom/Test/D.java
index 6f52a7ee2695..810e498f06c2 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 = -3072675993595278609L;
+    private static final long serialVersionUID = 6301131462154472425L;
 
     /** @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 966cb456ae34..3eeb389eeb6d 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 = 3196717234919024850L;
+    private static final long serialVersionUID = -5639002737077521966L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/custom/Test/S.java b/slice2java/python/test/Ice/custom/Test/S.java
index dbc46fee2dbd..ad0d1b9ed05e 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 = -2655568113838257618L;
+    private static final long serialVersionUID = -658670931536063442L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Base.java b/slice2java/python/test/Ice/defaultValue/Test/Base.java
index 7a47673eb257..dc43c94611be 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 = 5175929234023701131L;
+    private static final long serialVersionUID = -6312799816640488949L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java
index ff834347cbe6..2995b5f04857 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 = -1851806211532691777L;
+    private static final long serialVersionUID = 5702442291247565759L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 6d4ebd60a856..4bfb4999090b 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 = 6537189344719561423L;
+    private static final long serialVersionUID = -5740587218847257265L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index c1f2f7add0a0..548b9e6062f3 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 = 4346163958949923856L;
+    private static final long serialVersionUID = -313189653285750184L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Derived.java b/slice2java/python/test/Ice/defaultValue/Test/Derived.java
index 0de872effe56..23263ef7a4d6 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 = -8144437420103391693L;
+    private static final long serialVersionUID = 3159178773041427891L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java
index 563e846f945c..3c20539e7fd9 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 = -759058554953417340L;
+    private static final long serialVersionUID = 4631047521617465092L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index 227d2852fbf3..ba9e0ac4b998 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 = -1564295082858407253L;
+    private static final long serialVersionUID = 5163506926077183659L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index db0aed0de6d6..3ffce2049808 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 = 6071353912105458720L;
+    private static final long serialVersionUID = -8604604274350841880L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java
index 366483330cf1..e9a72950c7c9 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 = 5127389119246028011L;
+    private static final long serialVersionUID = 5127392167115035171L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java
index c3dad952cee0..ce62cbcd595a 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 = -1900381777783961576L;
+    private static final long serialVersionUID = 3544048015029569816L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java
index 726429e8f81b..2a3436151443 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 = 467096138948127338L;
+    private static final long serialVersionUID = -6849158183461651478L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java
index 6377e100df14..8e8f0ab8c010 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 = 8982182442385250081L;
+    private static final long serialVersionUID = -2742529287934446487L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/A.java b/slice2java/python/test/Ice/exceptions/Test/A.java
index d3ecce5f878d..fb5f0ecb7cf5 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 = 7823741836469472657L;
+    private static final long serialVersionUID = 7823737923269249789L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/B.java b/slice2java/python/test/Ice/exceptions/Test/B.java
index 77ec3d1ced1a..1716d2e49f0b 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 = -3861419351895343791L;
+    private static final long serialVersionUID = -3861412519930266947L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/C.java b/slice2java/python/test/Ice/exceptions/Test/C.java
index 7d5bfe645ff5..f90d6e14f9bf 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 = 1080695527672257937L;
+    private static final long serialVersionUID = 1080691614472035069L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/D.java b/slice2java/python/test/Ice/exceptions/Test/D.java
index 36d82ae658dd..a3b4637da188 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 = 4780372916206734417L;
+    private static final long serialVersionUID = 4780379748171811261L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java
index 3937d27e14fb..c337558e8ecd 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 = -4641407441027662843L;
+    private static final long serialVersionUID = -4641411635660882583L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/A.java b/slice2java/python/test/Ice/objects/Test/A.java
index 4245c7b0ff85..6124f7f3bd51 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 = 326590392002669969L;
+    private static final long serialVersionUID = -1339113630933335919L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/A1.java b/slice2java/python/test/Ice/objects/Test/A1.java
index 9c9fc886a93e..0a9c93b26f12 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 = -5926743790826334564L;
+    private static final long serialVersionUID = -5926739306695339317L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/B.java b/slice2java/python/test/Ice/objects/Test/B.java
index 66667c36c37b..719fd9366fce 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 = -8890914965587389836L;
+    private static final long serialVersionUID = -8890911667301212893L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/B1.java b/slice2java/python/test/Ice/objects/Test/B1.java
index 14d289bc5275..3962875a804f 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 = -1023223945653172732L;
+    private static final long serialVersionUID = 728180589606448260L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Base.java b/slice2java/python/test/Ice/objects/Test/Base.java
index b6328b751230..a51c505e3cc6 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 = -6303497205727317628L;
+    private static final long serialVersionUID = 2790770663282535140L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/C.java b/slice2java/python/test/Ice/objects/Test/C.java
index 14341af0dd8d..14de5ff28fc8 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 = 1107810229975838940L;
+    private static final long serialVersionUID = -3956683897334350741L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/COneMember.java b/slice2java/python/test/Ice/objects/Test/COneMember.java
index 9f78cd49e2af..653f727967d8 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 = 3050968951629665291L;
+    private static final long serialVersionUID = 3050969143977434361L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java
index 1df741de833a..81033112917d 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 = -5141023519763900965L;
+    private static final long serialVersionUID = 2658745941971403931L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/D.java b/slice2java/python/test/Ice/objects/Test/D.java
index 8152d93819ab..7c4535011cc9 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 = 81942554001293057L;
+    private static final long serialVersionUID = 3518033343214109686L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/D1.java b/slice2java/python/test/Ice/objects/Test/D1.java
index b2ed3bbe10ee..1f5ee4848a88 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 = -5339957947631557821L;
+    private static final long serialVersionUID = -454380277791014333L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/E.java b/slice2java/python/test/Ice/objects/Test/E.java
index 17ffb6325f7d..468c296aede8 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 = -7671836529668173789L;
+    private static final long serialVersionUID = -7199661868035869757L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/EBase.java b/slice2java/python/test/Ice/objects/Test/EBase.java
index 45338dcd2b17..bd553531e700 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 = 5187984800203642830L;
+    private static final long serialVersionUID = 1880022406724000846L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/EDerived.java b/slice2java/python/test/Ice/objects/Test/EDerived.java
index 11414e55d8d3..5bf5ac2c0d6d 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 = -5340678235487479086L;
+    private static final long serialVersionUID = 4734991431020139218L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/EOneMember.java b/slice2java/python/test/Ice/objects/Test/EOneMember.java
index 632d0a52a578..85c762fa68f1 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 = -6225284095117421180L;
+    private static final long serialVersionUID = -6225284160901681866L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java
index c49823b490d8..50811498c8e1 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 = 3011958859087594196L;
+    private static final long serialVersionUID = 6642024917775404564L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/F.java b/slice2java/python/test/Ice/objects/Test/F.java
index 56d83641d44d..7344e3390c70 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 = -7770990378756601839L;
+    private static final long serialVersionUID = 807131138749917649L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/F1.java b/slice2java/python/test/Ice/objects/Test/F1.java
index 01dd4733c4ff..3718bef4d218 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 = 6192371963478980952L;
+    private static final long serialVersionUID = 6192371883391942752L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/F3.java b/slice2java/python/test/Ice/objects/Test/F3.java
index 0ea2652fd7a0..886b8785361a 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 = -7123354619467824654L;
+    private static final long serialVersionUID = -76814654403741326L;
 
     /** @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 ec589b5cf191..366c54053356 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 = -1425257422311078882L;
+    private static final long serialVersionUID = -1425254299503686967L;
 
     /** @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 fdd0fdb30648..5ac93b523a15 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 = -2337225582248399195L;
+    private static final long serialVersionUID = -2337225106981247246L;
 }
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 972611bb1351..3a62550ef4be 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 = -1298675981586593119L;
+    private static final long serialVersionUID = -1298688899075489034L;
 
     /** @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 1249858dd591..d4aef9c369da 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 = 1842241722047289537L;
+    private static final long serialVersionUID = 1842226157121407766L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/K.java b/slice2java/python/test/Ice/objects/Test/K.java
index 7aaf434aa11a..39d2929f9758 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 = 4645159746674370017L;
+    private static final long serialVersionUID = 4645160712778659638L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/L.java b/slice2java/python/test/Ice/objects/Test/L.java
index 262c1a314ce9..36d14e20db19 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 = 6629735916102293207L;
+    private static final long serialVersionUID = 6629743383367754880L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/M.java b/slice2java/python/test/Ice/objects/Test/M.java
index b6de6d2aba7f..b64d2f0b1158 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 = -8088100855583054487L;
+    private static final long serialVersionUID = -8088101506395228802L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Recursive.java b/slice2java/python/test/Ice/objects/Test/Recursive.java
index ac06babcf789..0d7cd43cc610 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 = 3617875831772203070L;
+    private static final long serialVersionUID = 3617887387896519017L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/S.java b/slice2java/python/test/Ice/objects/Test/S.java
index 33b44e1f8b86..db6a25146d04 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 = 481770096536843748L;
+    private static final long serialVersionUID = 481773224313740979L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/SOneMember.java b/slice2java/python/test/Ice/objects/Test/SOneMember.java
index 41a823e95164..65d34026f8cc 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 = 6227745196517834130L;
+    private static final long serialVersionUID = 6227745174795068704L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/STwoMembers.java b/slice2java/python/test/Ice/objects/Test/STwoMembers.java
index 47d20d479ac6..17f917cf157f 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 = -4379043031754836926L;
+    private static final long serialVersionUID = -7252241696534688894L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/StructKey.java b/slice2java/python/test/Ice/objects/Test/StructKey.java
index 88fb9fd14034..c42d8affc4ab 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 = -4801760798922283665L;
+    private static final long serialVersionUID = 1452286294671646223L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java
index e66bba86b8f8..82e06f0ee561 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 = 2723848252277271145L;
+    private static final long serialVersionUID = 2723850942479277335L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/MyClass1.java b/slice2java/python/test/Ice/operations/Test/MyClass1.java
index f99d38c587e3..c0b63b0fc532 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 = 5392790360671341433L;
+    private static final long serialVersionUID = -1175634320186637765L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct.java b/slice2java/python/test/Ice/operations/Test/MyStruct.java
index 79df342fdf42..c9fd53104553 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 = 4708875243327982557L;
+    private static final long serialVersionUID = 518904807576669309L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct1.java b/slice2java/python/test/Ice/operations/Test/MyStruct1.java
index 2138acbe8c9a..62e913f4ddf9 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 = -6392308637156528656L;
+    private static final long serialVersionUID = -1175785666206447182L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/Structure.java b/slice2java/python/test/Ice/operations/Test/Structure.java
index ef1b64ae284f..ff824a767c7c 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 = -7011756804659601498L;
+    private static final long serialVersionUID = -8618303710060915787L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/A.java b/slice2java/python/test/Ice/optional/Test/A.java
index ca98f102ccd5..5a5ec1e357dd 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 = 7761593515535111056L;
+    private static final long serialVersionUID = -3792292399604835824L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/B.java b/slice2java/python/test/Ice/optional/Test/B.java
index 01ed2ddbb40d..a783c4bef060 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 = 8701645813045089507L;
+    private static final long serialVersionUID = -3831973590412611869L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/C.java b/slice2java/python/test/Ice/optional/Test/C.java
index 9fae353213bf..e4a02b8a84e3 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 = 4448059437258541245L;
+    private static final long serialVersionUID = -8708330192337858051L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/DerivedException.java b/slice2java/python/test/Ice/optional/Test/DerivedException.java
index f9a69c425981..566c0d9d6b4c 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 = -5757699015836484240L;
+    private static final long serialVersionUID = 3962816367528654039L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/E.java b/slice2java/python/test/Ice/optional/Test/E.java
index 2984c85d0797..8caf5e40172e 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 = -1850731348497462702L;
+    private static final long serialVersionUID = -1850732455142351231L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/F.java b/slice2java/python/test/Ice/optional/Test/F.java
index 9bc7bf5dcdb6..761ebc544fbb 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 = -6430490026339187039L;
+    private static final long serialVersionUID = -6430494059570790414L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/FixedStruct.java b/slice2java/python/test/Ice/optional/Test/FixedStruct.java
index bf626d27ccd2..be388724cb52 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 = 1569609474177313976L;
+    private static final long serialVersionUID = 1569613623428790391L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/G.java b/slice2java/python/test/Ice/optional/Test/G.java
index ddcf0b20367c..cc2b56b37937 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 = 3264285341943679891L;
+    private static final long serialVersionUID = 7465226430106860563L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/G1.java b/slice2java/python/test/Ice/optional/Test/G1.java
index 1c519dda071e..23365ae2653f 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 = 7339787424050866366L;
+    private static final long serialVersionUID = 7339783264216079193L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/G2.java b/slice2java/python/test/Ice/optional/Test/G2.java
index 25bbb5193fb7..89bf621d0a3a 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 = 3824559264839000617L;
+    private static final long serialVersionUID = 3824558158179853488L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/MultiOptional.java b/slice2java/python/test/Ice/optional/Test/MultiOptional.java
index c8a775df5359..cec9a2957ac7 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 = 9023105594134594028L;
+    private static final long serialVersionUID = 486824417208448651L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/OneOptional.java b/slice2java/python/test/Ice/optional/Test/OneOptional.java
index 96b022633ab2..72df99caad67 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 = -7219607318867404586L;
+    private static final long serialVersionUID = -7219608779435521767L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/OptionalException.java b/slice2java/python/test/Ice/optional/Test/OptionalException.java
index 35da3209a540..bcf3f100b724 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 = -171879449310017215L;
+    private static final long serialVersionUID = -7391732754989705967L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java
index 8aa14d6482f8..b198ee98c9a7 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 = -4542660540116026757L;
+    private static final long serialVersionUID = -5465113649519112645L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/RequiredException.java b/slice2java/python/test/Ice/optional/Test/RequiredException.java
index c0e40cf48640..79d307ffd374 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 = 2894241359539539639L;
+    private static final long serialVersionUID = 2894245387609164560L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/SmallStruct.java b/slice2java/python/test/Ice/optional/Test/SmallStruct.java
index 8f3e560c046b..9b1373b6b0d1 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 = 6700996007642153698L;
+    private static final long serialVersionUID = 6700991969166886957L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/VarStruct.java b/slice2java/python/test/Ice/optional/Test/VarStruct.java
index 3a128f550e69..901823d12e76 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 = -1912281443533295050L;
+    private static final long serialVersionUID = -1912285603368082223L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/WD.java b/slice2java/python/test/Ice/optional/Test/WD.java
index a6fc5460864a..61dc54f6e32b 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 = 981213508866508264L;
+    private static final long serialVersionUID = 223984747382998944L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/C1.java b/slice2java/python/test/Ice/packagemd/Test1/C1.java
index 364a8452c913..4bf486a8ecfd 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 = 1894608616842286295L;
+    private static final long serialVersionUID = 1894596500432341298L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/C2.java b/slice2java/python/test/Ice/packagemd/Test1/C2.java
index e1b5a5c49f81..af8861b40ea8 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 = 2892574512343787413L;
+    private static final long serialVersionUID = 2892576080122010650L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/E1.java b/slice2java/python/test/Ice/packagemd/Test1/E1.java
index d7715be2124e..7679da0bea23 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 = 5787332618378263640L;
+    private static final long serialVersionUID = 5787344938988428029L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test1/E2.java b/slice2java/python/test/Ice/packagemd/Test1/E2.java
index 4debb07b0f69..a75db504e0e8 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 = 4908753544439332047L;
+    private static final long serialVersionUID = 4908749019031352896L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test1/def.java b/slice2java/python/test/Ice/packagemd/Test1/def.java
index c6dfded3f30c..6a6733f7f92c 100644
--- a/slice2java/python/test/Ice/packagemd/Test1/def.java
+++ b/slice2java/python/test/Ice/packagemd/Test1/def.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7298390907094166027L;
+    private static final long serialVersionUID = 7298389135222965358L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test2/C1.java b/slice2java/python/test/Ice/packagemd/Test2/C1.java
index e07d4d6f659c..97ade14e040a 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 = -860914216227030471L;
+    private static final long serialVersionUID = -860914992311309708L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test2/C2.java b/slice2java/python/test/Ice/packagemd/Test2/C2.java
index 58a97632366d..37e7b5197e44 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 = 954147970797743468L;
+    private static final long serialVersionUID = 954148307745231667L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test2/E1.java b/slice2java/python/test/Ice/packagemd/Test2/E1.java
index 5ee4e44c9d88..8a8cc3250925 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 = 6934985235902758166L;
+    private static final long serialVersionUID = 6934990188590923355L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test2/E2.java b/slice2java/python/test/Ice/packagemd/Test2/E2.java
index 1866b6b21e45..47f332e01b14 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 = 5414543602608002357L;
+    private static final long serialVersionUID = 5414537805196239338L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test3/C1.java b/slice2java/python/test/Ice/packagemd/Test3/C1.java
index df9ca72fd181..fcbaadff2a9c 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 = 5832346299648707640L;
+    private static final long serialVersionUID = 5832345435905680373L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test3/C2.java b/slice2java/python/test/Ice/packagemd/Test3/C2.java
index 86c9524f6247..4adb61b5c141 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 = 2769381596119419212L;
+    private static final long serialVersionUID = 2769376648375230355L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test3/E1.java b/slice2java/python/test/Ice/packagemd/Test3/E1.java
index f5207c5d77ad..6db2ca4f206d 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 = 5344590970121952439L;
+    private static final long serialVersionUID = 5344590715758536442L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test3/E2.java b/slice2java/python/test/Ice/packagemd/Test3/E2.java
index 3b707b1a9f7e..8e893ed71a5c 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 = -8399046505858837484L;
+    private static final long serialVersionUID = -8399046599998553653L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/C.java b/slice2java/python/test/Ice/scope/Test/C.java
index 363b67b0aa7d..b337d0a6ec82 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 = -5190244056865918288L;
+    private static final long serialVersionUID = -5190250937805024671L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/C1.java b/slice2java/python/test/Ice/scope/Test/C1.java
index f7dbd0aa463a..7ca6d404bded 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 = 8893234933833280844L;
+    private static final long serialVersionUID = 8893236524919514461L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/C2.java b/slice2java/python/test/Ice/scope/Test/C2.java
index 200fb4833c72..6ff700c55ed9 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 = -1764785960792159905L;
+    private static final long serialVersionUID = 3946099970107247374L;
 
     /** @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 f381b88a195c..289bafd32917 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 = 4615627886964967949L;
+    private static final long serialVersionUID = 4615626339894370012L;
 
     /** @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 b196a6cdf3eb..bed20d9a1bca 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 = 672588120497403552L;
+    private static final long serialVersionUID = 672586738439122609L;
 
     /** @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 35ca78bc3498..914d2ed804f6 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 = 8654437535414470295L;
+    private static final long serialVersionUID = 8654436109636136710L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/Inner/S.java b/slice2java/python/test/Ice/scope/Test/Inner/S.java
index 652c14320d44..b4a1a941f803 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 = 3694613906948200283L;
+    private static final long serialVersionUID = 3694623226183368778L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S.java b/slice2java/python/test/Ice/scope/Test/S.java
index 124f8cecd4da..14d62ef8571d 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 = 2159702167837790373L;
+    private static final long serialVersionUID = 2159695330799458356L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S1.java b/slice2java/python/test/Ice/scope/Test/S1.java
index 6dfc2c91c906..06db06ca22c9 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 = 1241683596354824693L;
+    private static final long serialVersionUID = 1241676885728416228L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S2.java b/slice2java/python/test/Ice/scope/Test/S2.java
index 5903c3b199dc..39fb8775f6cc 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 = -5888305942971405786L;
+    private static final long serialVersionUID = 3775277830844374135L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java
index 4dd6120e341d..46757cf0040e 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 = -477017083886876348L;
+    private static final long serialVersionUID = -477021655533674923L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java
index f123e9470302..2ea980316236 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 = 3485210396702371682L;
+    private static final long serialVersionUID = 3485210954604929907L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 26d12a6c924b..c46cb8db09cd 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 = 1717371196666978067L;
+    private static final long serialVersionUID = 1717375933755074818L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 0dcc04b33b2c..2e59eef622a2 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 = -7384917133483512886L;
+    private static final long serialVersionUID = -7384921865263562277L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index 6b13338d5176..3089a352d089 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 = 3424371620896026134L;
+    private static final long serialVersionUID = 3424382310452201676L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 8d6a788d9c75..d482e9afdbaf 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 = -1172606541024701753L;
+    private static final long serialVersionUID = -1172594567900958307L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 05e94a45bc0d..04f0ce83d89d 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 = -1126117089145019970L;
+    private static final long serialVersionUID = -1126112536644632092L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index a8258eb10884..3ad5098b9bc4 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 = -2097581434626579938L;
+    private static final long serialVersionUID = -2097571426965491004L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/B.java b/slice2java/python/test/Ice/slicing/objects/Test/B.java
index d69c3f1c726e..5c868dcf787e 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 = -6346101053582329777L;
+    private static final long serialVersionUID = -3913793080013364639L;
 
     /** @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 ab5f2844ac01..c3d35534a7ed 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 = 1471165618769654275L;
+    private static final long serialVersionUID = -432956923703320531L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java
index f8dfa939594d..e55912e6face 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 = -6396998091333111533L;
+    private static final long serialVersionUID = -6396997444341653860L;
 
     /** @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 0f5ed3038859..342d8fc4a9e3 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 = -9066881219717547134L;
+    private static final long serialVersionUID = -9066884727205422913L;
 
     /** @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 cd6f3b986471..690942ee194d 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 = -5910229973322253716L;
+    private static final long serialVersionUID = 206035352976595170L;
 
     /** @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 30f66a58be3c..9457d4ab6551 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 = -8975467458185630766L;
+    private static final long serialVersionUID = -3489432155471026158L;
 
     /** @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 660308b8e38b..8f3779d56489 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 = -4836276809249843309L;
+    private static final long serialVersionUID = -5297922171308077507L;
 
     /** @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 f7f16fde8670..42a2cbf3f719 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 = 9015768987145463923L;
+    private static final long serialVersionUID = -8418839274758328589L;
 
     /** @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 c32f6363183d..a8074494018b 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 = 1003771571835287282L;
+    private static final long serialVersionUID = 2870180378911742388L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java
index f20ed306a635..9b3254eb7703 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 = -7655923025329569005L;
+    private static final long serialVersionUID = -7655930748407932196L;
 
     /** @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 35c430e4a684..036ada0784fe 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 = -2271128834593255506L;
+    private static final long serialVersionUID = -2271121276913480228L;
 
     /** @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 5233da0662e9..e8b457bc5d78 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 = 4147520450938859134L;
+    private static final long serialVersionUID = 4147525184244896940L;
 
     /** @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 82d0e369e79e..10002e720a41 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 = 481709123800303597L;
+    private static final long serialVersionUID = 481709738449714062L;
 
     /** @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 28bb2fc3cf4a..5265a3e9afb4 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 = -4426882953155262637L;
+    private static final long serialVersionUID = -4426882471476304932L;
 
     /** @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 cfad8aa7137d..23251fd420db 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 = 850539787985295131L;
+    private static final long serialVersionUID = 850540153532329704L;
 
     /** @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 0873ca109369..8d75c0d2b8b2 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 = -4328908171309606060L;
+    private static final long serialVersionUID = -4328908009920003621L;
 
     /** @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 3fd01586288e..25950a533463 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 = -5081806465517843284L;
+    private static final long serialVersionUID = -5081806626860970351L;
 
     /** @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 4230a0647c3a..473470e95b0c 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 = 643079399157213061L;
+    private static final long serialVersionUID = 643089849874123256L;
 
     /** @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 e87e9384a3f4..b1bb671c4141 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 = -2438007706824425247L;
+    private static final long serialVersionUID = -2437998899110292514L;
 
     /** @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 f53426543fb3..2bf24c748e35 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 = 1070051713197822154L;
+    private static final long serialVersionUID = 4661947144486081752L;
 
     /** @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 fe1617bbbdd4..72845d88f546 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 = -8813712475769912135L;
+    private static final long serialVersionUID = -8813706298565983253L;
 
     /** @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 2f2029828d6d..fb1c2a097317 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 = 3651528598656218453L;
+    private static final long serialVersionUID = 3651536156338754144L;
 
     /** @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 1422554be443..9b4b68114e87 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 = 8804376192943038832L;
+    private static final long serialVersionUID = 8804375733353828037L;
 
     /** @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 f22e407592a3..abaad92ac3cc 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 = -4989058837460793486L;
+    private static final long serialVersionUID = -4989069025927569760L;
 
     /** @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 461ca82289e1..ed954bbc0244 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 = -5353761062092623354L;
+    private static final long serialVersionUID = -5353757874904664333L;
 
     /** @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 2877655ed145..3702e31de1a2 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 = -6522135138747199977L;
+    private static final long serialVersionUID = -6522143936283176003L;
 
     /** @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 69b1ab1268cd..6413f98ff611 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 = 7620287330586578964L;
+    private static final long serialVersionUID = 7620281250462864894L;
 
     /** @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 d5c0d1dffabf..7e82512c6448 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 = 3136548465854028650L;
+    private static final long serialVersionUID = -3277300451725122852L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java
index c68639f38b96..59e3551ba3b4 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 = 7312396419923790252L;
+    private static final long serialVersionUID = 2449747432922887660L;
 
     /** @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 9f6eff66c67d..418e08243c0e 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 = 7887663190901348282L;
+    private static final long serialVersionUID = -5183715649322579334L;
 }
diff --git a/slice2java/python/test/Slice/escape/Clash/Cls.java b/slice2java/python/test/Slice/escape/Clash/Cls.java
index 44b03e8224d2..a0042f197a0e 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 = 7038790632308646786L;
+    private static final long serialVersionUID = 746310969987925029L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/escape/Clash/Ex.java b/slice2java/python/test/Slice/escape/Clash/Ex.java
index 6daa4d4f02d9..cd4424778b4a 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 = -5218948071549041306L;
+    private static final long serialVersionUID = 4765013758616560870L;
 }
diff --git a/slice2java/python/test/Slice/escape/Clash/St.java b/slice2java/python/test/Slice/escape/Clash/St.java
index 66af7a086cbd..f2366d727d16 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 = 2148813429282540378L;
+    private static final long serialVersionUID = -3919426528369336131L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/_continue.java b/slice2java/python/test/Slice/escape/and/_continue.java
index 0ecc7d20cdd5..2c32d709bf7d 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 = 1201373942695228935L;
+    private static final long serialVersionUID = 1201380668675292287L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/_for.java b/slice2java/python/test/Slice/escape/and/_for.java
index 6b9aab9771ac..ae38873cbd76 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 = 997975773677221389L;
+    private static final long serialVersionUID = 8520413533746465514L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/escape/and/is.java b/slice2java/python/test/Slice/escape/and/is.java
index 3f456da008ba..45bb0ea2fc84 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 = -4585938354500092676L;
+    private static final long serialVersionUID = -4585939640655637372L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/not.java b/slice2java/python/test/Slice/escape/and/not.java
index 6f50502a0a27..b7a9b85253e4 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 = -8510972715535031943L;
+    private static final long serialVersionUID = -2203559108042877383L;
 }
diff --git a/slice2java/python/test/Slice/macros/Test/Default.java b/slice2java/python/test/Slice/macros/Test/Default.java
index 67c56bd2fda9..f6b65286d9e3 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 = 4895178245657905886L;
+    private static final long serialVersionUID = -3089163464740997666L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/macros/Test/NoDefault.java b/slice2java/python/test/Slice/macros/Test/NoDefault.java
index e263f8c7c289..ac547a2152d8 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 = -5954066313925397569L;
+    private static final long serialVersionUID = 7377417483607854783L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/structure/Test/C.java b/slice2java/python/test/Slice/structure/Test/C.java
index f55d7261f214..fa6004146735 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 = 1667160101172209561L;
+    private static final long serialVersionUID = 1667158479254186367L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/structure/Test/S1.java b/slice2java/python/test/Slice/structure/Test/S1.java
index cc390d2a9757..a325545d5f6c 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 = -5542858093949881359L;
+    private static final long serialVersionUID = -5542859876322597673L;
 }
diff --git a/slice2java/python/test/Slice/structure/Test/S2.java b/slice2java/python/test/Slice/structure/Test/S2.java
index 640b483a795a..6d1d5c7316e6 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 = -353751783408548055L;
+    private static final long serialVersionUID = 5922775032619665769L;
 }
diff --git a/slice2java/python/test/Slice/structure/Test/S3.java b/slice2java/python/test/Slice/structure/Test/S3.java
index f92ef9e0b546..f679afe0f29d 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 = 341794985845437636L;
+    private static final long serialVersionUID = 7834104384801128290L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java
index 5c340fc4f7ac..7fc9cbd67984 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 = -932976186871371635L;
+    private static final long serialVersionUID = -2214411220776827187L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 37ed4623a30e..149982267153 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 = -931337522864885429L;
+    private static final long serialVersionUID = -7092863056290158645L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 7bc9001a096d..24077a166501 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 = -4211367003641519587L;
+    private static final long serialVersionUID = 7482862650050497311L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java
index 08a94c823c18..903fd6764bf9 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 = 8161178323763111243L;
+    private static final long serialVersionUID = 1482746905226636107L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java
index afc07f38a4dd..a249dee8f6c0 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 = 5127392354240035897L;
+    private static final long serialVersionUID = 5127390367962443323L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java
index e381cc033bf2..f573a0c8fe2d 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 = 4138222669988605798L;
+    private static final long serialVersionUID = 4783864295443931750L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java
index 25973ea9abc1..404ae60c006e 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 = 2814347009543280384L;
+    private static final long serialVersionUID = 6457479591708200384L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java
index 2487d6bafdfd..c1135cec9933 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 = -3624304882908065240L;
+    private static final long serialVersionUID = -1392816408192767958L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/A.java b/slice2java/ruby/test/Ice/exceptions/Test/A.java
index 8721935116e2..c44f373165f8 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 = 7823742081852880427L;
+    private static final long serialVersionUID = 7823746769976602715L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/B.java b/slice2java/ruby/test/Ice/exceptions/Test/B.java
index 1f28013840dc..058132d64ac5 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 = -3861419437127875477L;
+    private static final long serialVersionUID = -3861408963379310821L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/C.java b/slice2java/ruby/test/Ice/exceptions/Test/C.java
index 300ed53b3ec0..06871d7ec31c 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 = 1080695773055665707L;
+    private static final long serialVersionUID = 1080700461179387995L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/D.java b/slice2java/ruby/test/Ice/exceptions/Test/D.java
index 99408d74adf3..6c2276b320e1 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 = 4780372830974202731L;
+    private static final long serialVersionUID = 4780383304722767387L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java
index d5745e18ec5f..c342ae926575 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 = -4641407515946687041L;
+    private static final long serialVersionUID = -4641412376811740209L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/A.java b/slice2java/ruby/test/Ice/objects/Test/A.java
index 7291f5da6df5..433d90c2ecc6 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 = -6600802560817154328L;
+    private static final long serialVersionUID = -5060935160023325869L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/A1.java b/slice2java/ruby/test/Ice/objects/Test/A1.java
index f21aa2bc2c25..700e4e87fddb 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 = -5926741711581930905L;
+    private static final long serialVersionUID = -5926742052510451361L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/B.java b/slice2java/ruby/test/Ice/objects/Test/B.java
index 82a98ccf82b3..08c1bfaad132 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 = -8890920340525043773L;
+    private static final long serialVersionUID = -8890919999577597007L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/B1.java b/slice2java/ruby/test/Ice/objects/Test/B1.java
index fe2f40c7fb8d..d4259c35d6d6 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 = 292180746593874692L;
+    private static final long serialVersionUID = -1690002042471610492L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/Base.java b/slice2java/ruby/test/Ice/objects/Test/Base.java
index d04be5d9e0d2..6b4e8472f14d 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 = -6055228039590062551L;
+    private static final long serialVersionUID = 9214971691571019867L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/C.java b/slice2java/ruby/test/Ice/objects/Test/C.java
index 026acc7b2fc9..87d393f263b9 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 = -3344450487920824245L;
+    private static final long serialVersionUID = 8191892959807157755L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/COneMember.java b/slice2java/ruby/test/Ice/objects/Test/COneMember.java
index 9dc718590d85..07c6d68262ff 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 = 3050973113936020464L;
+    private static final long serialVersionUID = 3050969781960127559L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java
index 19b343f94c67..0dbc14f8ff6f 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 = -3512898369414969061L;
+    private static final long serialVersionUID = 658416971213784411L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/D.java b/slice2java/ruby/test/Ice/objects/Test/D.java
index 8eaf61132a4f..e962a65b63e6 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 = -2545715273651621841L;
+    private static final long serialVersionUID = 6968654826654174566L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/D1.java b/slice2java/ruby/test/Ice/objects/Test/D1.java
index fa1cdd8d8266..c39e91f9b75f 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 = 2898701299836571459L;
+    private static final long serialVersionUID = 5158722133260529603L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/E.java b/slice2java/ruby/test/Ice/objects/Test/E.java
index 6a4a8a1bfdf8..0c8bd798ffa3 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 = -2509540926203274234L;
+    private static final long serialVersionUID = -3149301775983490041L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/EBase.java b/slice2java/ruby/test/Ice/objects/Test/EBase.java
index b2de83c3ac2b..6afada9db609 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 = -8793386174459312178L;
+    private static final long serialVersionUID = -3083583282154505906L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/EDerived.java b/slice2java/ruby/test/Ice/objects/Test/EDerived.java
index a599d16fb8f8..08890febbc67 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 = -8721206263383611950L;
+    private static final long serialVersionUID = -4008152705814297006L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java
index eae62092be01..645984b4c269 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 = -6225288130860267969L;
+    private static final long serialVersionUID = -6225291703072063288L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java
index 9be828a74bd9..72627f131c68 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 = -5633074844547774060L;
+    private static final long serialVersionUID = 2245427950812222164L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/F.java b/slice2java/ruby/test/Ice/objects/Test/F.java
index 1c26b572c0ce..b175ca99e3a4 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 = -1902094267981234095L;
+    private static final long serialVersionUID = 6494645965474747345L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/F1.java b/slice2java/ruby/test/Ice/objects/Test/F1.java
index d1fdec2e3123..a8de1b5302cb 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 = 6192371883407786046L;
+    private static final long serialVersionUID = 6192372146857477490L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/F3.java b/slice2java/ruby/test/Ice/objects/Test/F3.java
index 60a162ccdf31..fecc20110d41 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 = -3612670347319889616L;
+    private static final long serialVersionUID = 260910598830376339L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/K.java b/slice2java/ruby/test/Ice/objects/Test/K.java
index a8f277a80dc4..b035a1853f7f 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 = 4645163639157020852L;
+    private static final long serialVersionUID = 4645163298209645700L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/L.java b/slice2java/ruby/test/Ice/objects/Test/L.java
index 98909cdc6c0a..f943d811757f 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 = 6629734673728952684L;
+    private static final long serialVersionUID = 6629735014657645204L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/M.java b/slice2java/ruby/test/Ice/objects/Test/M.java
index 51a794905634..aef71583e61c 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 = -8088093517450308217L;
+    private static final long serialVersionUID = -8088093176503087836L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/Recursive.java b/slice2java/ruby/test/Ice/objects/Test/Recursive.java
index 0924b1901924..2d9f3d2bee16 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 = 3617878722070427714L;
+    private static final long serialVersionUID = 3617879063016330922L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/S.java b/slice2java/ruby/test/Ice/objects/Test/S.java
index 5d5954f88fa6..c22226b00659 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 = 481770171461219423L;
+    private static final long serialVersionUID = 481770512389809447L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java
index 342b3fe03c9a..473c355683a3 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 = 6227757410167632169L;
+    private static final long serialVersionUID = 6227760736843976414L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java
index 62a215e36cd0..0b23221d4390 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 = -6772267543785804542L;
+    private static final long serialVersionUID = 1697133529447424834L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/StructKey.java b/slice2java/ruby/test/Ice/objects/Test/StructKey.java
index 63632a35a585..06890a3e8936 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 = -8692553541135832246L;
+    private static final long serialVersionUID = -2198310320275076789L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java
index bbc4392596ef..d836aee14ecb 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 = 2723851186495802797L;
+    private static final long serialVersionUID = 2723847718987429533L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java
index b1e9247675f5..e187cf37019a 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 = 6517394340782998823L;
+    private static final long serialVersionUID = 263487652650021230L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java
index 61dfab3bb0b9..07b80bbc5380 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 = 9175634463895111709L;
+    private static final long serialVersionUID = -6535194650129049667L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java
index 177d80ecd697..541c7b0aaca3 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 = -6855947371849931922L;
+    private static final long serialVersionUID = 7704033125114993031L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/Structure.java b/slice2java/ruby/test/Ice/operations/Test/Structure.java
index 00efc48eb4f9..bfc3630b7dee 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 = 8928089398316217651L;
+    private static final long serialVersionUID = -6531412701039107478L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/A.java b/slice2java/ruby/test/Ice/optional/Test/A.java
index 7b7524b83927..2a4d1301a52e 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 = 3846539748402379152L;
+    private static final long serialVersionUID = 4043319863095013008L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/B.java b/slice2java/ruby/test/Ice/optional/Test/B.java
index 65fcd8e2e6e7..d1ae9a8d1e38 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 = 6144607374784882531L;
+    private static final long serialVersionUID = -6157110258671512989L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/C.java b/slice2java/ruby/test/Ice/optional/Test/C.java
index bb8689035294..1bb22d2a253e 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 = 6949373640396848253L;
+    private static final long serialVersionUID = 4636952423889306493L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java
index 01aeba534791..0e43a1eb29d8 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 = -3312186486901668745L;
+    private static final long serialVersionUID = 8150152127676261987L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/E.java b/slice2java/ruby/test/Ice/optional/Test/E.java
index 1e61b993ba99..b37a0173b5b3 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 = -1850742761121501163L;
+    private static final long serialVersionUID = -1850732590988587787L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/F.java b/slice2java/ruby/test/Ice/optional/Test/F.java
index 6939457b2d5f..54b348a27b11 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 = -6430489208761828890L;
+    private static final long serialVersionUID = -6430494239022850298L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java
index a2028a5fce20..452a25f1dd58 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 = 1569605009489959803L;
+    private static final long serialVersionUID = 1569613686930230595L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/G.java b/slice2java/ruby/test/Ice/optional/Test/G.java
index 3aa55906b373..4b32efcda285 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 = -8400560593321927277L;
+    private static final long serialVersionUID = -5436266857545715629L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/G1.java b/slice2java/ruby/test/Ice/optional/Test/G1.java
index c4ddba0c86d7..2947d2145cde 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 = 7339781298694338681L;
+    private static final long serialVersionUID = 7339783211175975789L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/G2.java b/slice2java/ruby/test/Ice/optional/Test/G2.java
index 713a22cadb5c..4f99bb2b2ef5 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 = 3824547852212808238L;
+    private static final long serialVersionUID = 3824558022347941380L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java
index d0700bf02d92..af133d3cc9c7 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 = 1245703547496997350L;
+    private static final long serialVersionUID = -487775744561551474L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java
index bae555d44b32..6a947983c78e 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 = -7219601363830618475L;
+    private static final long serialVersionUID = -7219608721389470611L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java
index ed17f76600a0..91c1816d7a17 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 = 3172530475535105958L;
+    private static final long serialVersionUID = -5911723408447495003L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java
index 3db0bd6e49a3..af9a015f995d 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 = 5769047074334452347L;
+    private static final long serialVersionUID = 7236550437105562555L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java
index e8f29a236509..246fa48edb6b 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 = 2894235407087634544L;
+    private static final long serialVersionUID = 2894245412218276708L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java
index 93f649f6c07c..fda4bcad6888 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 = 6700991370063965733L;
+    private static final long serialVersionUID = 6700991955019001049L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java
index e9291f6c66c5..19b6c265e08d 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 = -1912287568889822735L;
+    private static final long serialVersionUID = -1912285656408185627L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/WD.java b/slice2java/ruby/test/Ice/optional/Test/WD.java
index 399d027d82b4..ed816263391c 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 = -6522985235603298292L;
+    private static final long serialVersionUID = -6410203520163605792L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C.java b/slice2java/ruby/test/Ice/scope/Test/C.java
index 20f6ae0bbe77..bf318c4a6196 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 = -5190250779023439501L;
+    private static final long serialVersionUID = -5190250257111347333L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C1.java b/slice2java/ruby/test/Ice/scope/Test/C1.java
index 91439f630559..f425d47bee66 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 = 8893236681274789491L;
+    private static final long serialVersionUID = 8893230389096151227L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C2.java b/slice2java/ruby/test/Ice/scope/Test/C2.java
index 230462e4c8b1..dfd097b2b4f7 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 = -1793829577201497814L;
+    private static final long serialVersionUID = -1881062307292944569L;
 
     /** @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 dd223c3272c1..68864be5cdbc 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 = 4615626178534453196L;
+    private static final long serialVersionUID = 4615625659045455150L;
 
     /** @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 0e9e8cdf2d22..f977f81aace6 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 = 672586897370421774L;
+    private static final long serialVersionUID = 672580602579264112L;
 
     /** @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 837430313559..fbee3bc0b73d 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 = 8654435953282595547L;
+    private static final long serialVersionUID = 8654442245462345364L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java
index 57ecb6239c18..e78360b2adb4 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 = 3694623390127945879L;
+    private static final long serialVersionUID = 3694612996555631448L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S.java b/slice2java/ruby/test/Ice/scope/Test/S.java
index b7248c6cb0f8..5177569c801a 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 = 2159695164271945321L;
+    private static final long serialVersionUID = 2159705560427195686L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S1.java b/slice2java/ruby/test/Ice/scope/Test/S1.java
index abfa0d83db81..92c8c47f3731 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 = 1241677039505582922L;
+    private static final long serialVersionUID = 1241672111244194178L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S2.java b/slice2java/ruby/test/Ice/scope/Test/S2.java
index b8c26e6a121c..4a50e0be630d 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 = -4179827893765425709L;
+    private static final long serialVersionUID = -2219954414763557954L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java
index f2cfbbfc2326..18d0067e914c 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 = -477024219161836392L;
+    private static final long serialVersionUID = -477024303042867625L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 7dfb0214cc21..ffee00b3b137 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 = 3485213996109448766L;
+    private static final long serialVersionUID = 3485213602114122609L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index db69154e394b..731dcc8070c8 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 = 1717377815526097103L;
+    private static final long serialVersionUID = 1717378581264267520L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index bf656576f171..f76d38318cbb 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 = -7384918136897169642L;
+    private static final long serialVersionUID = -7384919217754369575L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java
index a9a87db31add..21c0668c64c5 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 = -1559226851264902449L;
+    private static final long serialVersionUID = -1826567433442109343L;
 
     /** @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 38b0c4473c84..dbdb373dced8 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 = 8615694653580343939L;
+    private static final long serialVersionUID = -3773439474188364755L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 22a71ed31585..fc1b5ba68f67 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 = -6397001817409170744L;
+    private static final long serialVersionUID = -6396997945431225328L;
 
     /** @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 7d30838865a0..607b8b9836cc 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 = -9066880338823693769L;
+    private static final long serialVersionUID = -9066883328614538563L;
 
     /** @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 15c3e0311d82..16f6743db48d 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 = 7914616616027495692L;
+    private static final long serialVersionUID = 1736218556775034786L;
 
     /** @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 6d026ed8f289..4bffb2413eb3 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 = -3679464120103963512L;
+    private static final long serialVersionUID = -1867034703488224835L;
 
     /** @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 2d781fbc3d40..a6da2bc3f558 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 = 5430865643521652754L;
+    private static final long serialVersionUID = 1540612759565290164L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java
index 790ab34112e7..501a473629b2 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 = -7655923585865240064L;
+    private static final long serialVersionUID = -7655926536697635129L;
 
     /** @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 61b0acc27392..2cc5576747af 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 = -2271128274281617829L;
+    private static final long serialVersionUID = -2271125488620576344L;
 
     /** @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 356ceb99b7a4..ff46c4fe1f86 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 = 481713447476261400L;
+    private static final long serialVersionUID = 481705527046193166L;
 
     /** @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 51dbf8c7afc9..c3a25498e883 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 = -4426886844235626360L;
+    private static final long serialVersionUID = -4426882972565876400L;
 
     /** @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 060b3f2a0b04..5e30a5bd9776 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 = 850538911135228226L;
+    private static final long serialVersionUID = 850539972736014436L;
 
     /** @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 e3c732988f35..72b514b8c364 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 = -4328898181991158325L;
+    private static final long serialVersionUID = -4328908190731649839L;
 
     /** @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 2a7f9b8ad64a..c2ccb166c955 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 = -5081819099853995986L;
+    private static final long serialVersionUID = -5081806446064663779L;
 
     /** @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 0a51f937bc0d..f5ce3121cffe 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 = 643085665316099440L;
+    private static final long serialVersionUID = 643077540658241018L;
 
     /** @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 ef96f902ebcf..5c573a161eb1 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 = -2438014042878955564L;
+    private static final long serialVersionUID = -2438005597957147548L;
 
     /** @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 f2df4a5f7a22..3a85930a4096 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 = 3651529159151892384L;
+    private static final long serialVersionUID = 3651531944783507106L;
 
     /** @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 53b5881ce91b..3a345b4d0fa0 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 = 8804382779594407045L;
+    private static final long serialVersionUID = 8804374334611075975L;
 
     /** @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 a319ce6d937d..d00c8c64c8da 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 = -5353761943043248333L;
+    private static final long serialVersionUID = -5353764573670819663L;
 
     /** @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 55b2304b9fa7..8ca16b0eb8f4 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 = -6522139712957476446L;
+    private static final long serialVersionUID = -6522131627069378119L;
 
     /** @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 d9ff70fb52d3..add7f8ce4fb5 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 = 7620288131461385313L;
+    private static final long serialVersionUID = 7620290762195475706L;
 
     /** @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 86640eb03745..fc14dbb7ea9b 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 = -5768835522157305046L;
+    private static final long serialVersionUID = 1678544097225283932L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/and.java b/slice2java/ruby/test/Slice/escape/BEGIN/and.java
index 12a2381bbe32..fe5a5c9e881d 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 = 1440109826018832588L;
+    private static final long serialVersionUID = 1440101922253544481L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/display.java b/slice2java/ruby/test/Slice/escape/BEGIN/display.java
index 516c626f74c7..d5b3e31ffdee 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 = 1039345904202354054L;
+    private static final long serialVersionUID = -5426447096442032760L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/next.java b/slice2java/ruby/test/Slice/escape/BEGIN/next.java
index 525939779c9e..9aee7a68925b 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 = 3375551094327930203L;
+    private static final long serialVersionUID = 3375552695596550518L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java
index 6c95e1e2de7b..9f697dd2177a 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 = 3843895179403252463L;
+    private static final long serialVersionUID = -8410660443561630737L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/Clash/Cls.java b/slice2java/ruby/test/Slice/escape/Clash/Cls.java
index fa7874679eab..b82c0f091141 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 = -3978162569158816120L;
+    private static final long serialVersionUID = -2026944132418102786L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/escape/Clash/Ex.java b/slice2java/ruby/test/Slice/escape/Clash/Ex.java
index 7dc7a6400608..77892854096e 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 = -626091396401215649L;
+    private static final long serialVersionUID = 3265195622634994326L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/Clash/St.java b/slice2java/ruby/test/Slice/escape/Clash/St.java
index 1c900ca5c3c0..979e35496c65 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 = -5609135417166830862L;
+    private static final long serialVersionUID = 1076977846974302339L;
 }
diff --git a/slice2java/ruby/test/Slice/macros/Test/Default.java b/slice2java/ruby/test/Slice/macros/Test/Default.java
index 0442898ca543..c8c176380969 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 = -1940905083654031906L;
+    private static final long serialVersionUID = 1689303128192832958L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java
index 57583e42cff7..aeaaba4731c3 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 = 1060820852150617279L;
+    private static final long serialVersionUID = -3384408933779036705L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/structure/Test/C.java b/slice2java/ruby/test/Slice/structure/Test/C.java
index 1fdb4dbb1b59..47f9684c4834 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 = -3172274024636260396L;
+    private static final long serialVersionUID = -3172276837458092458L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/structure/Test/S1.java b/slice2java/ruby/test/Slice/structure/Test/S1.java
index 5b48743b84fa..c9470d80e767 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 = -5542855685290552208L;
+    private static final long serialVersionUID = -5542863782794717838L;
 }
diff --git a/slice2java/ruby/test/Slice/structure/Test/S2.java b/slice2java/ruby/test/Slice/structure/Test/S2.java
index 1ba620e05f05..f79572825767 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 = -6518923515246963254L;
+    private static final long serialVersionUID = -8050519369232012472L;
 }
diff --git a/slice2java/scripts/Test/Common/Config.java b/slice2java/scripts/Test/Common/Config.java
index e78ad6899ef9..d4fe1cc7df8f 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 = -4725039849874459911L;
+    private static final long serialVersionUID = -8901133866759496170L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/scripts/Test/Common/OptionOverrides.java b/slice2java/scripts/Test/Common/OptionOverrides.java
index 1f0a6f098809..8421601d4883 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 = -8218162069884758011L;
+    private static final long serialVersionUID = -5763304005608651766L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/scripts/Test/Common/ProcessFailedException.java b/slice2java/scripts/Test/Common/ProcessFailedException.java
index 7d27bbeaee80..325cddd24b1b 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 = 5103745413642465147L;
+    private static final long serialVersionUID = 5103744206039827412L;
 }
diff --git a/slice2java/scripts/Test/Common/TestCaseFailedException.java b/slice2java/scripts/Test/Common/TestCaseFailedException.java
index 87a9cc9a0308..1a4b5c0019ae 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 = 7577600692428960361L;
+    private static final long serialVersionUID = 7577593869527078214L;
 }
diff --git a/slice2java/scripts/Test/Common/TestCaseNotExistException.java b/slice2java/scripts/Test/Common/TestCaseNotExistException.java
index 3a5b575040e5..dfdd33d8a376 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 = -8656783744417831689L;
+    private static final long serialVersionUID = -8656774361973628584L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java
index 2aea31f05495..26dc826b51df 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 = 8990440150115273327L;
+    private static final long serialVersionUID = 8990436625609306395L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java
index bfc75b4f812f..d1a496ddc1f1 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 = -562179259669540921L;
+    private static final long serialVersionUID = 7538083399290713002L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java
index 895cb49674b3..fea7949b0cf3 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 = -5089368732506049388L;
+    private static final long serialVersionUID = -5089370318485899678L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java
index 41ff986658e5..6021400bafa3 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 = -1542957567440753281L;
+    private static final long serialVersionUID = -8485797705787928065L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java
index a64d9e1a079b..08a121b6a17a 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 = 3127754577913890865L;
+    private static final long serialVersionUID = -3350642789258164751L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java
index b94128684fdb..d9d6f36a638f 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 = 1772229628749432922L;
+    private static final long serialVersionUID = 5194990217594188954L;
 
     /** @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 45d6b2b3a06d..9ee2065fade7 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 = -8962230494349108873L;
+    private static final long serialVersionUID = -3034940116478115785L;
 
     /** @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 96c8a1edfc96..02a9c09f08b4 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 = 5606438899709385695L;
+    private static final long serialVersionUID = 2639802837442727417L;
 
     /** @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 a1f26069a3b4..8fe067030fc4 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 = -3392859860798638289L;
+    private static final long serialVersionUID = -9144960635237642129L;
 
     /** @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 c61c8fd02b25..1e33591f0858 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 = 5738778913652672345L;
+    private static final long serialVersionUID = -334874583136513601L;
 
     /** @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 6550df660e32..2edc2b8da290 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 = -7637115178953337125L;
+    private static final long serialVersionUID = -3640794836936072357L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java
index db11f7ad2bf0..a975821cd7b7 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 = 438631032761507033L;
+    private static final long serialVersionUID = 247368500708830271L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java
index 80e66092331e..36cefafc203c 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 = -3852482062547264027L;
+    private static final long serialVersionUID = 3351408188519285797L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java
index 06a6220c8bac..7d4b4a5a1dd2 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 = 2760286281555315703L;
+    private static final long serialVersionUID = -8224635049855632521L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java
index 8ae13e35ef84..00e0150ec666 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 = 7719095787755407268L;
+    private static final long serialVersionUID = 1600234112399563876L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java
index 8748dcb13f58..ca51b10dccef 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 = 5447257530486663652L;
+    private static final long serialVersionUID = 5447252576415255776L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java
index 51c615bffd96..009e58d569a2 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 = 5318003131051958456L;
+    private static final long serialVersionUID = -3576851243928556433L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java
index 14be7d67ba48..e25971848dab 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 = -8260690041368799256L;
+    private static final long serialVersionUID = -5118315418964462872L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java
index aa291358fea9..d1a71ddb35c1 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 = 1379120810540636106L;
+    private static final long serialVersionUID = -2242949486507285720L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java
index e824082683ef..9edafcae494c 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 = -243177522643894548L;
+    private static final long serialVersionUID = -243182476715302424L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java
index 36654afd2b87..99110a1bed85 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 = 7644443171521555783L;
+    private static final long serialVersionUID = 7644439976425997616L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java
index 4538fbb1d0f7..ed5fd58fecf2 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 = 4699860149724660900L;
+    private static final long serialVersionUID = 4699860485506054048L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java
index e07367b8ef17..f37381bcb71b 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 = 2380779950603779606L;
+    private static final long serialVersionUID = -4088245270831536031L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java
index cfbb2f6f3fa9..5c3bc895de4c 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 = -7534598320140662767L;
+    private static final long serialVersionUID = -7858155752828487245L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java
index 39259bbe0bf0..b03b21692d93 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 = -7270584401004529365L;
+    private static final long serialVersionUID = -7270586059249122769L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java
index c4f65e903318..0b2c45cdd2b7 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 = -4456335670199429781L;
+    private static final long serialVersionUID = 2461804578980220220L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java
index 190eef5eeb66..1e0046ac0f28 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 = 737382793054255864L;
+    private static final long serialVersionUID = 5475769579672836280L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java
index e48f8b619bd3..23ea47b89b5f 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 = 4463373046351202061L;
+    private static final long serialVersionUID = 4463365282045493641L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java
index 38f43d385c50..ed90abeff7b6 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 = -1971524709946957613L;
+    private static final long serialVersionUID = -1971526959607117404L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java
index 585eca61bd8e..639bc53dc282 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 = -2108797997055178400L;
+    private static final long serialVersionUID = -2108801287875062761L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java
index 6823744cf8d8..88892a285921 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 = -1402527567969002153L;
+    private static final long serialVersionUID = -910992755224468649L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java
index 741fcdd7c119..e0a2395cc1f0 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 = -6801504071675731923L;
+    private static final long serialVersionUID = -6801500760352138199L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java
index 96369b31d2ec..215700b81e31 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 = 6184521113303223992L;
+    private static final long serialVersionUID = -3699770790523821224L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java
index 67cc3ba166a2..1f750ce12db1 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 = -8985149723296649826L;
+    private static final long serialVersionUID = -8985147734436256358L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java
index 09603eb238b8..f653415bce9f 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 = 2337759136049847670L;
+    private static final long serialVersionUID = 2337760649766627585L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java
index 0e21cb90f67d..1c31844064b6 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 = -6003723435727707086L;
+    private static final long serialVersionUID = -6003725525328286651L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java
index a8426a4571db..d4f29f604d5c 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 = -3008467571697655359L;
+    private static final long serialVersionUID = 2383469298752802211L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java
index f9bd2770dfd3..ccf56cd697ab 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 = 173883434569154101L;
+    private static final long serialVersionUID = 3728089448658461333L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java
index 1dac7c2af6a7..511a624add5a 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 = -4539016455562508474L;
+    private static final long serialVersionUID = 454669612160724260L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java
index dd8b9029124e..b0c58c7ba1b1 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 = -4455302595584112083L;
+    private static final long serialVersionUID = 3389514786238623981L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java
index b8af9f153980..75d191a1bb91 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 = -5774527317243013903L;
+    private static final long serialVersionUID = -5774527983640207115L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java
index ab52a06f2de0..cac2e5f6e6d5 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 = 1907951095018017188L;
+    private static final long serialVersionUID = -6673437230916952796L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java
index 1df1af39e215..534aa8dec191 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 = 7541316991237035347L;
+    private static final long serialVersionUID = -1577893567422242317L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java
index 0aeda544547b..fea9d46d8d44 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 = 2018884091663577028L;
+    private static final long serialVersionUID = -8784564630728758669L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java
index 031d1c163eea..c49066549955 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 = 6991422810492118880L;
+    private static final long serialVersionUID = 6991429087026448228L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java
index 80b05f9ed81c..1ffcfb4a42b4 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 = -2002082344649833014L;
+    private static final long serialVersionUID = 3415527889945538570L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java
index 7b1e5b7a69f0..66d655fc5a30 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 = 7672379237262151293L;
+    private static final long serialVersionUID = 7672378415888523001L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java
index 9dc608c67333..45d45be6bf23 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 = 2733090233662045875L;
+    private static final long serialVersionUID = 2733089732572473911L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java
index 6d3782a395da..6dcf5c40aefb 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 = -5694235048029832342L;
+    private static final long serialVersionUID = -5694235438242736583L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java
index 83e5e4d322c1..96140ace5726 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 = 7526799177434869752L;
+    private static final long serialVersionUID = 7526795866111276028L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java
index 6abc4d58d041..3a716a668731 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 = -5330286329696072444L;
+    private static final long serialVersionUID = -4125526439117631580L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java
index f8a76d2eb092..66ce8490be79 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 = -8592761025434886481L;
+    private static final long serialVersionUID = -8594210323703116689L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java
index 9cf0cbedefd4..d12ef49a8dcc 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 = -4805106813719732249L;
+    private static final long serialVersionUID = 4798298716460129831L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java
index 7ff173f3ff26..27d5490fb68b 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 = 8544194000666451460L;
+    private static final long serialVersionUID = 8544199956916445696L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java
index 34c9b46be7d8..3655fed3332e 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 = -248220648183120655L;
+    private static final long serialVersionUID = 5327310956067901681L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java
index fe3a7d894e0c..6f3f0a61f4e1 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 = 1650882339287900301L;
+    private static final long serialVersionUID = 5181558534884270541L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java
index 5803157531ae..e812d9025615 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 = -8245397003790150381L;
+    private static final long serialVersionUID = -4946922676897515676L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java
index 134a3541f6dc..6f2717982f02 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 = -3979203317982697674L;
+    private static final long serialVersionUID = -3658727799571112074L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java
index 61e16317f5df..b18e4456c3f4 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 = 8074543286692746036L;
+    private static final long serialVersionUID = 8023764739317739188L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java
index 6559efdb0a5e..7a71a7f294aa 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 = 8238650158735272644L;
+    private static final long serialVersionUID = 1260260071671476932L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java
index aedf3d132f26..39b4f97b7b45 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 = -2699426676726635170L;
+    private static final long serialVersionUID = -2699419398013440678L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java
index 6bf351c7bc21..68b703970310 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 = -8149888249708716921L;
+    private static final long serialVersionUID = -6478892700155746297L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java
index 8091cf79f668..118386e500bc 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 = 2232897543721630975L;
+    private static final long serialVersionUID = 5550322780101167359L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java
index b53a5ddbe9cd..51aaec42fad2 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 = 573411727750380385L;
+    private static final long serialVersionUID = 548834954702573409L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java
index 1bd6916127da..3c015aadbebf 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 = -4721401438425625255L;
+    private static final long serialVersionUID = 6914576512113815545L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java
index 97dc79591d62..32ec29821569 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 = -311927694656910923L;
+    private static final long serialVersionUID = -2202367648774731467L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java
index 81d06cf4b33a..a090cd58601e 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 = -7021223679807808718L;
+    private static final long serialVersionUID = -5257455795765099195L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java
index 9e1fbdf14996..7b7aac4343f7 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 = 7896653860831740224L;
+    private static final long serialVersionUID = 7896654008222125583L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java
index faf69938d1ee..965d056c40a0 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 = 807468797052013719L;
+    private static final long serialVersionUID = 4493543542938707209L;
 
     /** @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 73ba6fd1191f..b7aca1bc73a2 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 = -7985037177060523487L;
+    private static final long serialVersionUID = 6689451014589250401L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java
index d9fe5ac4191b..35c2c8e2c038 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 = -1090061194151610271L;
+    private static final long serialVersionUID = -1090061132147604434L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java
index d7ad49fefcb1..d89875081b12 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 = 243155756565760009L;
+    private static final long serialVersionUID = 243155984005615814L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java
index 7933b7bbddb7..cc6f13a02c84 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 = -491993509642865957L;
+    private static final long serialVersionUID = 6549089148254821440L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java
index 8110d3348d5d..2f6e00418b8b 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 = -8653870525256075867L;
+    private static final long serialVersionUID = -8653870628564561046L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java
index 2093bb37cd5c..debe113430c8 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 = -6283739465000980860L;
+    private static final long serialVersionUID = -6283739482923086517L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java
index f2eaa29737aa..9c9562d61688 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 = 3979362987147709416L;
+    private static final long serialVersionUID = 3979362803746927399L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Base.java b/slice2java/swift/test/Ice/defaultValue/Test/Base.java
index 9719d1b08d3d..9c5fb4e85b99 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 = 4906794675078863809L;
+    private static final long serialVersionUID = -7399487903571173407L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java
index 5217981b62e9..87d7ff5e0774 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 = -1858512847856515979L;
+    private static final long serialVersionUID = 3183526718313560597L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java
index 5362a03fe462..931404355534 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 = 1149345697752680516L;
+    private static final long serialVersionUID = -960110279734116028L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java
index 139b34c47db3..d0373b56ae26 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 = -7322140687389205901L;
+    private static final long serialVersionUID = -5457284614640923149L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java
index f6be6a8ee74d..dbc5fd0dee30 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 = 8796947121178694501L;
+    private static final long serialVersionUID = 6827323976360461029L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java
index 62a7b79a0cd0..98a0a4227bc8 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 = -4263077749473284176L;
+    private static final long serialVersionUID = -1096579350676320304L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java
index 2e4e8dea8dc8..e04a4b5c7054 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 = 1893212552672921447L;
+    private static final long serialVersionUID = -9144090800429951769L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/A.java b/slice2java/swift/test/Ice/exceptions/Test/A.java
index ee505d18740f..affc28431add 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 = 7823737104526084734L;
+    private static final long serialVersionUID = 7823746771101834129L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/B.java b/slice2java/swift/test/Ice/exceptions/Test/B.java
index 5dc0783256b6..e7cec2ea1492 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 = -3861418959293691586L;
+    private static final long serialVersionUID = -3861408962102420655L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/C.java b/slice2java/swift/test/Ice/exceptions/Test/C.java
index e721c1b024a6..b7924cd64b8d 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 = 1080690795728870014L;
+    private static final long serialVersionUID = 1080700462304619409L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/D.java b/slice2java/swift/test/Ice/exceptions/Test/D.java
index adf1e5a66d97..51a8c6d54113 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 = 4780373308808386622L;
+    private static final long serialVersionUID = 4780383305999657553L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/E.java b/slice2java/swift/test/Ice/exceptions/Test/E.java
index 9aeab760d986..2e4248f66356 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 = -1876976394247085315L;
+    private static final long serialVersionUID = -1876971857227703252L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/F.java b/slice2java/swift/test/Ice/exceptions/Test/F.java
index 6df208274874..6132ab2b9b3b 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 = 733472863517252926L;
+    private static final long serialVersionUID = 733479557122262511L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java
index e647622f2470..d33d08c6faaf 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 = -4641410811611898134L;
+    private static final long serialVersionUID = -4641412375660303099L;
 }
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java
index 2665584f2cd2..e3da847bec9e 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 = 954226032542655646L;
+    private static final long serialVersionUID = 954232318041728875L;
 
     /** @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 11dcfdd700ba..db936c1b7d3b 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 = 1339628418498907140L;
+    private static final long serialVersionUID = 1339641481616199409L;
 
     /** @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 e6ffedd4ca6c..398211559c38 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 = -2729311862788041722L;
+    private static final long serialVersionUID = -2729304254826850573L;
 
     /** @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 d59d7a2e601c..e73cfc6c8dd3 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 = -3435403761100664576L;
+    private static final long serialVersionUID = -3435401608313982987L;
 
     /** @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 8fe6d13232da..8909694f6bec 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 = -836170970167536615L;
+    private static final long serialVersionUID = -836183867977068116L;
 
     /** @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 d0a7423fb883..3163239a413c 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 = 1132522676009061540L;
+    private static final long serialVersionUID = 1132530278965661585L;
 
     /** @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 2fc21e057f12..c469682f972a 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 = -6335555245422654554L;
+    private static final long serialVersionUID = -6335553097631355501L;
 
     /** @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 4ba1e6412d92..605de0a8473a 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 = -4007410007209049952L;
+    private static final long serialVersionUID = -4007413314583060587L;
 
     /** @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 949d41a93dab..f2b3aa31c9fc 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 = 991425155513043352L;
+    private static final long serialVersionUID = 991425985837607021L;
 
     /** @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 352a6b720f62..9d5c40ce91bd 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 = -2880333908165899196L;
+    private static final long serialVersionUID = -2880326465512608335L;
 
     /** @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 1b838dd9b0cd..9b00e6a27480 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 = -8808278315158473658L;
+    private static final long serialVersionUID = -8808265417349081677L;
 
     /** @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 ecbb979e0fcf..8ef41760ebcb 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 = -771852887208025536L;
+    private static final long serialVersionUID = -771856354885345355L;
 
     /** @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 43f98b5a83ab..b5b3ba7e9f71 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 = 6566353845676542747L;
+    private static final long serialVersionUID = 6566346403023112366L;
 
     /** @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 7802933705dc..eae6ade2292e 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 = 6983805211307018980L;
+    private static final long serialVersionUID = 6983807193790418001L;
 
     /** @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 4d542792a4a8..b71a1d57717c 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 = -1175224714818990874L;
+    private static final long serialVersionUID = -1175217277170290861L;
 
     /** @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 2f3bc64407f3..eb7807f4aff9 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 = -3279712684928069152L;
+    private static final long serialVersionUID = -3279721612775280811L;
 
     /** @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 8142bcc51661..4ce2570d3dd8 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 = -4359175377849933926L;
+    private static final long serialVersionUID = -4359180002681471377L;
 
     /** @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 d1850efb5f35..ecc52cc3fbba 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 = 5904685206050295172L;
+    private static final long serialVersionUID = 5904698269167587441L;
 
     /** @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 f541784227ac..c533380c3ff8 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 = 1835744924763346310L;
+    private static final long serialVersionUID = 1835752532724537459L;
 
     /** @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 6577df7604e4..0ace4cca504e 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 = -2252404414330981760L;
+    private static final long serialVersionUID = -2252402261544300171L;
 
     /** @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 7992f1e726de..b29162192c20 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 = -1203529402821496043L;
+    private static final long serialVersionUID = -1203531390300416864L;
 
     /** @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 9c8928cc326a..a141d788e4f0 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 = -7537769355578223580L;
+    private static final long serialVersionUID = -7537761752621623535L;
 
     /** @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 e509219097f3..b575669f7697 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 = 3440896796699611942L;
+    private static final long serialVersionUID = 3440898944490910995L;
 
     /** @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 7fa43cc5fb06..9cba6b5400b8 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 = 9151099475694921760L;
+    private static final long serialVersionUID = 9151096168320911125L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/A.java b/slice2java/swift/test/Ice/objects/Test/A.java
index 49decb12849b..4d7537c9ba8b 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 = -8505151682695565384L;
+    private static final long serialVersionUID = 8234576560829220856L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/A1.java b/slice2java/swift/test/Ice/objects/Test/A1.java
index c55aa828a50a..5bec1bf32840 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 = -5926746641022492948L;
+    private static final long serialVersionUID = -5926737056955822291L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/B.java b/slice2java/swift/test/Ice/objects/Test/B.java
index 99890f620612..170b05f41fc5 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 = -8890912360773136404L;
+    private static final long serialVersionUID = -8890913682020837395L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/B1.java b/slice2java/swift/test/Ice/objects/Test/B1.java
index 5c7ba5d6acc0..4ca5eb48d4e0 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 = 4171878293112593028L;
+    private static final long serialVersionUID = -5842930254053321980L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Base.java b/slice2java/swift/test/Ice/objects/Test/Base.java
index c3b0a8b680b7..de72fa176c8b 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 = 6296625483541141243L;
+    private static final long serialVersionUID = 4590096317230830875L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/BaseEx.java b/slice2java/swift/test/Ice/objects/Test/BaseEx.java
index 621d8df305c4..d5f8e8832039 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 = 3897769880348693182L;
+    private static final long serialVersionUID = 3897779464415364095L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/C.java b/slice2java/swift/test/Ice/objects/Test/C.java
index 50ae373b40e9..b7c5a261e97d 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 = 5569317379404334054L;
+    private static final long serialVersionUID = -6077494218172191289L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/COneMember.java b/slice2java/swift/test/Ice/objects/Test/COneMember.java
index b8429127d31e..4acc856b706c 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 = 3050965756447583398L;
+    private static final long serialVersionUID = 3050967082702316903L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java
index c4d8e3d88a00..f9e805711704 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 = -3349795652740323685L;
+    private static final long serialVersionUID = 4469635765330823195L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/D.java b/slice2java/swift/test/Ice/objects/Test/D.java
index 56d8336fa3c7..cceef4acb6e7 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 = -2395882058970650832L;
+    private static final long serialVersionUID = -6907894370980713967L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/D1.java b/slice2java/swift/test/Ice/objects/Test/D1.java
index ad34a38f51c2..5d246614589f 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 = 1018191980632204867L;
+    private static final long serialVersionUID = 1375495179109346755L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Derived.java b/slice2java/swift/test/Ice/objects/Test/Derived.java
index e0c4b6e36fc6..78b73b17d7d1 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 = -1587930529586112746L;
+    private static final long serialVersionUID = -1587922380435903164L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/E.java b/slice2java/swift/test/Ice/objects/Test/E.java
index 41729167464e..5fb1ec355dd6 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 = 9107997931632429254L;
+    private static final long serialVersionUID = 2300109058021211174L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/EBase.java b/slice2java/swift/test/Ice/objects/Test/EBase.java
index c1936dabd7b5..8ba475fc410e 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 = 381714603752800846L;
+    private static final long serialVersionUID = 416495625503357902L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/EDerived.java b/slice2java/swift/test/Ice/objects/Test/EDerived.java
index f2d77314b0c6..2edddbd80952 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 = -3290442934036300334L;
+    private static final long serialVersionUID = 5533576812735035218L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/EOneMember.java b/slice2java/swift/test/Ice/objects/Test/EOneMember.java
index db376e2684b1..447823402a5a 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 = -6225287385687864983L;
+    private static final long serialVersionUID = -6225277801621196376L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java
index 28dee33f6a20..be8cfc5bf472 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 = 5901002814072312596L;
+    private static final long serialVersionUID = -7693673727479352428L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/F.java b/slice2java/swift/test/Ice/objects/Test/F.java
index 617419e5332a..4fdd3175b301 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 = 5876395123473652177L;
+    private static final long serialVersionUID = 2574068656548383249L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/F1.java b/slice2java/swift/test/Ice/objects/Test/F1.java
index 5fec339b1c87..652598285172 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 = 6192372973396977650L;
+    private static final long serialVersionUID = 6192376295219086140L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/F3.java b/slice2java/swift/test/Ice/objects/Test/F3.java
index bf3aa7055382..571d0386efae 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 = 235867274997864855L;
+    private static final long serialVersionUID = 1847949046123562775L;
 
     /** @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 c86db7102eff..af938374fe86 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 = -1425260272354783482L;
+    private static final long serialVersionUID = -1425250688295016825L;
 
     /** @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 8d4a0e6a1817..95086aceca33 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 = -2337228517828467115L;
+    private static final long serialVersionUID = -2337227196578462060L;
 }
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 808d7f793a7f..0c891ac0d2f3 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 = -1298689742182304540L;
+    private static final long serialVersionUID = -1298691063351806619L;
 
     /** @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 d606abd5480f..54126643b91f 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 = 1842228206913142769L;
+    private static final long serialVersionUID = 1842229533167873968L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/K.java b/slice2java/swift/test/Ice/objects/Test/K.java
index b4d1521cf73e..86491a2740b8 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 = 4645162266476094949L;
+    private static final long serialVersionUID = 4645163587652427236L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/L.java b/slice2java/swift/test/Ice/objects/Test/L.java
index 1bf8a8763fd3..bac54646f77a 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 = 6629749676771758311L;
+    private static final long serialVersionUID = 6629740092705087398L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/M.java b/slice2java/swift/test/Ice/objects/Test/M.java
index 96a8a677d895..8c30162f7b60 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 = -8088103375389507720L;
+    private static final long serialVersionUID = -8088104701577470407L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Recursive.java b/slice2java/swift/test/Ice/objects/Test/Recursive.java
index 34945b523b74..7b3a4cbe7b28 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 = 3617889261904621519L;
+    private static final long serialVersionUID = 3617890583074057998L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/S.java b/slice2java/swift/test/Ice/objects/Test/S.java
index 227c680c09af..6e817d30ed2b 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 = 481778156510605268L;
+    private static final long serialVersionUID = 481776835260599957L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/SOneMember.java b/slice2java/swift/test/Ice/objects/Test/SOneMember.java
index cb9914d0e7e7..432b70eaeece 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 = 6227748572491052671L;
+    private static final long serialVersionUID = 6227747246236319166L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java
index 7e7817d93ea3..6ddea85de370 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 = -6223982767115624062L;
+    private static final long serialVersionUID = -1371915234957737470L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/StructKey.java b/slice2java/swift/test/Ice/objects/Test/StructKey.java
index c198a78e9d71..d30cfaf60b21 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 = 5799915585948333834L;
+    private static final long serialVersionUID = -1007973287662883990L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java
index a02cf94b42d4..b291b697aa07 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 = 2723850521472669676L;
+    private static final long serialVersionUID = 2723850820936840458L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/MyClass1.java b/slice2java/swift/test/Ice/operations/Test/MyClass1.java
index 15935ea050d6..fb83c9ba045f 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 = 7895142808424762927L;
+    private static final long serialVersionUID = 4076448600512989833L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct.java b/slice2java/swift/test/Ice/operations/Test/MyStruct.java
index bded104081a0..906efc826121 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 = -4778037610424612003L;
+    private static final long serialVersionUID = 8042344950022346269L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java
index 1d34e7d195a6..f927a1d30bf0 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 = -2314317145045812026L;
+    private static final long serialVersionUID = -735590615825542816L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/Structure.java b/slice2java/swift/test/Ice/operations/Test/Structure.java
index 56d5ba3c5797..bef702f20f56 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 = -2484102716845970440L;
+    private static final long serialVersionUID = -6826262147294768802L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/A.java b/slice2java/swift/test/Ice/optional/Test/A.java
index 811fecbea73d..e3c1c68cf38b 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 = -61417101361592688L;
+    private static final long serialVersionUID = -7125577586895328240L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/B.java b/slice2java/swift/test/Ice/optional/Test/B.java
index bd30bf54c918..246c656d5f8a 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 = -6447036536473995677L;
+    private static final long serialVersionUID = 1392343661740769763L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/C.java b/slice2java/swift/test/Ice/optional/Test/C.java
index 77741866a8cc..df043e054a1c 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 = -5897584702532972547L;
+    private static final long serialVersionUID = -1191972070610723715L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/DerivedException.java b/slice2java/swift/test/Ice/optional/Test/DerivedException.java
index cd8be99252fc..6a9550a91ccb 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 = 8108597954490315977L;
+    private static final long serialVersionUID = -8809235240346916807L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/E.java b/slice2java/swift/test/Ice/optional/Test/E.java
index e7fcc409a178..372c76ef940c 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 = -1850731227046486208L;
+    private static final long serialVersionUID = -1850731246499078544L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/F.java b/slice2java/swift/test/Ice/optional/Test/F.java
index 389ae0a9b419..3214c020ebd1 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 = -6430490152808972493L;
+    private static final long serialVersionUID = -6430490128351654013L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java
index 9f464c3d26a3..14e12ecbef6d 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 = 1569609435265577171L;
+    private static final long serialVersionUID = 1569609372062964963L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/G.java b/slice2java/swift/test/Ice/optional/Test/G.java
index 5d5d4e1afb0a..385489c5baa7 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 = 1370962985755447827L;
+    private static final long serialVersionUID = -3322445098360570413L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/G1.java b/slice2java/swift/test/Ice/optional/Test/G1.java
index b266f5cbec9a..799b8f308fb4 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 = 7339787297389616711L;
+    private static final long serialVersionUID = 7339787526050676407L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/G2.java b/slice2java/swift/test/Ice/optional/Test/G2.java
index afbd48c8128f..0b4f29db25ad 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 = 3824559386289705510L;
+    private static final long serialVersionUID = 3824559366841856854L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java
index e712824f0568..cd480db50c4b 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 = -7421137726107693128L;
+    private static final long serialVersionUID = 3818740315309395016L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/OneOptional.java b/slice2java/swift/test/Ice/optional/Test/OneOptional.java
index 75d9415badfd..c8820771caa0 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 = -7219607197300744067L;
+    private static final long serialVersionUID = -7219607420953449459L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalException.java b/slice2java/swift/test/Ice/optional/Test/OptionalException.java
index c49e30dbcd33..859584090241 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 = 4940055362472938633L;
+    private static final long serialVersionUID = -5116217492716417159L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java
index ffb0df45f4b0..7110ef8f1dab 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 = -1227954361926617797L;
+    private static final long serialVersionUID = -1070854351627839365L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/RequiredException.java b/slice2java/swift/test/Ice/optional/Test/RequiredException.java
index 13819c5402ee..c4ba8d92cfae 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 = 2894241320696174478L;
+    private static final long serialVersionUID = 2894241296390649662L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java
index b11f6bc4bbde..861a50e4b5a7 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 = 6700995881090944738L;
+    private static final long serialVersionUID = 6700996070855085138L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/VarStruct.java b/slice2java/swift/test/Ice/optional/Test/VarStruct.java
index 9bac8f8aa0cd..87f8c4fca2a1 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 = -1912281570193970737L;
+    private static final long serialVersionUID = -1912281341532911041L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/WD.java b/slice2java/swift/test/Ice/optional/Test/WD.java
index 4d9e45bcf310..376244f62ff8 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 = -7947311410886762982L;
+    private static final long serialVersionUID = 5451282928294814426L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C.java b/slice2java/swift/test/Ice/scope/Test/C.java
index 3f8da33332ee..6991872e1a8c 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 = -5190248370371587673L;
+    private static final long serialVersionUID = -5190251496934708444L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C1.java b/slice2java/swift/test/Ice/scope/Test/C1.java
index 947f72a6c076..69b20baaeee7 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 = 8893234794347149287L;
+    private static final long serialVersionUID = 8893231463580672548L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C2.java b/slice2java/swift/test/Ice/scope/Test/C2.java
index 331bcc8c73c2..6cb17b249463 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 = -364428922981252787L;
+    private static final long serialVersionUID = -5654473365482782856L;
 
     /** @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 396d26dedcec..350a5c3b4a88 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 = 4615626747822311941L;
+    private static final long serialVersionUID = 4615630039704544767L;
 
     /** @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 11532c99825a..496b4d7602a3 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 = 672593438559139968L;
+    private static final long serialVersionUID = 672584652622366162L;
 
     /** @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 d64348bcd418..7e1e99ce5aab 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 = 8654437674900208712L;
+    private static final long serialVersionUID = 8654440840362192844L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/S.java
index 342d7031f5cc..25814f841868 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 = 3694620503763992196L;
+    private static final long serialVersionUID = 3694611922038226432L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S.java b/slice2java/swift/test/Ice/scope/Test/S.java
index 0a552f271150..06cb7ec3ed00 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 = 2159701028761035514L;
+    private static final long serialVersionUID = 2159709775794701310L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S1.java b/slice2java/swift/test/Ice/scope/Test/S1.java
index b439039ef2c9..9aad3aa50c72 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 = 1241678605983412318L;
+    private static final long serialVersionUID = 1241675995983135517L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S2.java b/slice2java/swift/test/Ice/scope/Test/S2.java
index 9af6b70ba13f..39d6057ce373 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 = -1573941733398530764L;
+    private static final long serialVersionUID = 4803628093812009473L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java
index 7e5cee2b4751..44b51b5e146d 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 = -477023638019719782L;
+    private static final long serialVersionUID = -477021394792830432L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 77ceea0702bb..031a70c81137 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 = 3485214427440845372L;
+    private static final long serialVersionUID = 3485211380805742534L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index fcfda43646fa..5aec98aa45b6 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 = 1717377916241693645L;
+    private static final long serialVersionUID = 1717374825696679735L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index cf1cc636aaa6..a1106668d4ea 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 = -7384918387423486188L;
+    private static final long serialVersionUID = -7384920922664873938L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index a8eccb7b7743..ce65ac97e9cc 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 = 3424368013901698938L;
+    private static final long serialVersionUID = 3424382434437640670L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index a84bfdcf1dc2..36cc0a38564b 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 = -1172602086827657877L;
+    private static final long serialVersionUID = -1172594531574302193L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 6a0f0e1ced28..4bf56532897b 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 = -1126116088181489262L;
+    private static final long serialVersionUID = -1126112583123621386L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index 98a3cd6557a7..d14ed0508594 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 = -2097585723515993742L;
+    private static final long serialVersionUID = -2097571302980052010L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/B.java b/slice2java/swift/test/Ice/slicing/objects/Test/B.java
index bb8c5b62e755..a825f16e83ed 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 = -4186585823971279562L;
+    private static final long serialVersionUID = 8915728742701708854L;
 
     /** @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 33f67a6623d4..ea82ce9ea24a 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 = 6134522398860420730L;
+    private static final long serialVersionUID = 3930910166178373754L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 4262e3cf5a68..fdd9ba9df62c 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 = -6396997946651971388L;
+    private static final long serialVersionUID = -6397002061299385969L;
 
     /** @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 2a827171050d..0b1103f35efb 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 = -9066889544407583016L;
+    private static final long serialVersionUID = -9066880744193044424L;
 
     /** @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 33b1faa74a9d..be98182cb41a 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 = 3982892856306701397L;
+    private static final long serialVersionUID = 7265222826246999253L;
 
     /** @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 e706f8b8e2c2..4c1130838bde 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 = 7690373334726804160L;
+    private static final long serialVersionUID = 5128451450842195578L;
 
     /** @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 50d60a09e78d..6744c835ac9d 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 = 8884077681990177806L;
+    private static final long serialVersionUID = 366620938463423361L;
 
     /** @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 31286f7780bf..2002760a35ff 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 = -1594638054667719501L;
+    private static final long serialVersionUID = -7606060701001518989L;
 
     /** @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 70a34f616384..c38ef812eba8 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 = 7708884296867880114L;
+    private static final long serialVersionUID = 1893683509888297906L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java
index f8c49b40fade..c4b1d9711638 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 = -7655931386489125625L;
+    private static final long serialVersionUID = -7655923991235335129L;
 
     /** @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 6553e862e82e..5775a4cdb05f 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 = -2271120473658757520L;
+    private static final long serialVersionUID = -2271128199224748080L;
 
     /** @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 7fa44bef01e7..9281471b1ec1 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 = 4147532846443454630L;
+    private static final long serialVersionUID = 4147533373355319525L;
 
     /** @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 b51b93077eab..a4c772ff9e2d 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 = 481717280723742781L;
+    private static final long serialVersionUID = 481713853011350941L;
 
     /** @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 294bfaa6fbc4..bd83da19bb29 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 = -4426882973782022780L;
+    private static final long serialVersionUID = -4426886923126137009L;
 
     /** @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 5fc0a8c00a9b..dc8f4b599e03 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 = 850539973954329464L;
+    private static final long serialVersionUID = 850538307948683971L;
 
     /** @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 dc98a4060377..6c73545db4c1 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 = -4328908194523827769L;
+    private static final long serialVersionUID = -4328898746181472634L;
 
     /** @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 809a857e5a4d..33ef12657c02 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 = -5081806444856679066L;
+    private static final long serialVersionUID = -5081818535563276455L;
 
     /** @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 a2b2cd96e18f..5c57c97f9ea7 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 = 643087762669643103L;
+    private static final long serialVersionUID = 643085740373262207L;
 
     /** @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 b6df2f854e3a..3e00c76844ec 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 = -2438004992432490957L;
+    private static final long serialVersionUID = -2438013797656503469L;
 
     /** @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 b4898c832933..960cc33467ef 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 = 2351869962969190926L;
+    private static final long serialVersionUID = 5437864949042969882L;
 
     /** @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 4233c631487d..ec894faa7d46 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 = -8813705375180574573L;
+    private static final long serialVersionUID = -8813705729253328944L;
 
     /** @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 d29fb17c0fd3..c3967fce9846 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 = 3651536959784376903L;
+    private static final long serialVersionUID = 3651529234066448935L;
 
     /** @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 57f1298fefc1..739b049b7f93 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 = 8804373646323668450L;
+    private static final long serialVersionUID = 8804382534206230914L;
 
     /** @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 27dd2325e84e..efb9452a1357 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 = -4989065777823657081L;
+    private static final long serialVersionUID = -4989065617838978538L;
 
     /** @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 bda965e2542f..603da3d96c0e 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 = -5353758512899658476L;
+    private static final long serialVersionUID = -5353762028270870092L;
 
     /** @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 684aae95f718..21754f66183c 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 = -6522143298247574717L;
+    private static final long serialVersionUID = -6522139787876633053L;
 
     /** @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 30e0bfcadbfb..2b3a64808d43 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 = 7620284618663980480L;
+    private static final long serialVersionUID = 7620288216693598432L;
 
     /** @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 19ca3bc34811..6e3a0e3cc1de 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 = 2787715651399181350L;
+    private static final long serialVersionUID = 622378588164298470L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java
index a5fd04d91271..c41f7570c368 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 = -3115579188118397991L;
+    private static final long serialVersionUID = 7746604107676579541L;
 
     /** @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 5fa14cdb5c54..81fe26b0182c 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 = 2872153983167054185L;
+    private static final long serialVersionUID = -6032188069523930512L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java
index a1ecca9f6ac2..a437acee2d1f 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 = -3469865133165107654L;
+    private static final long serialVersionUID = 7965312413929617793L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/MyClass.java b/slice2java/swift/test/Ice/stream/Test/MyClass.java
index 5269c289550c..6d18787eabf0 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 = -6292888413874511327L;
+    private static final long serialVersionUID = 1709720623487377135L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/stream/Test/MyException.java b/slice2java/swift/test/Ice/stream/Test/MyException.java
index 343c199b12a3..d899988c3fb3 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 = 5734234887438477901L;
+    private static final long serialVersionUID = 5734227465348992144L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java
index 9f156ce38f9c..b6814dcb4645 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 = -5538588504257655629L;
+    private static final long serialVersionUID = -8255960647241559126L;
 
     /** @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 66513c2318a2..c5120c4c4226 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 = -1404701019783229213L;
+    private static final long serialVersionUID = -1404700336614921919L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java
index 766dc2794083..68eaf481faed 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 = -4749349732038636706L;
+    private static final long serialVersionUID = -7693774736826859328L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java
index 84e18facc6df..9a9db8fae435 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 = -8562117074632220591L;
+    private static final long serialVersionUID = -8562125857878081229L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java
index 14e61101bd4e..279177f7063b 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 = -5815731312665001150L;
+    private static final long serialVersionUID = 3006644241562402988L;
 }
diff --git a/slice2java/swift/test/Slice/escape/Clash/Cls.java b/slice2java/swift/test/Slice/escape/Clash/Cls.java
index d24f6cb2c3b2..7602bafcf3af 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 = -8031312163762757101L;
+    private static final long serialVersionUID = 7550030338868511134L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Slice/escape/Clash/Ex.java b/slice2java/swift/test/Slice/escape/Clash/Ex.java
index 094984ee409a..b7e13350a804 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 = 7488361673919555158L;
+    private static final long serialVersionUID = -6437639318168728800L;
 }
diff --git a/slice2java/swift/test/Slice/escape/Clash/St.java b/slice2java/swift/test/Slice/escape/Clash/St.java
index 86861118b3d8..bbd41a58fa9a 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 = 72819064041305165L;
+    private static final long serialVersionUID = -5622796607253400159L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/_return.java b/slice2java/swift/test/Slice/escape/and/_return.java
index 1a0306a6a4e9..8d54bff9c85a 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 = -8206186999208499625L;
+    private static final long serialVersionUID = -8206187479624258398L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/_switch.java b/slice2java/swift/test/Slice/escape/and/_switch.java
index 6b92b7183b89..bfe154f84b0f 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 = 6489619869374635284L;
+    private static final long serialVersionUID = -7239229230233498386L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Slice/escape/and/as.java b/slice2java/swift/test/Slice/escape/and/as.java
index 61dc36c57e5e..267714cf3de7 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 = -3585746557232850056L;
+    private static final long serialVersionUID = 148551584698687096L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/defer.java b/slice2java/swift/test/Slice/escape/and/defer.java
index 6998dd36f3d1..3d702c90665d 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 = 8824799119942362796L;
+    private static final long serialVersionUID = 8824788694992670172L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/guard.java b/slice2java/swift/test/Slice/escape/and/guard.java
index d3a7faeffa80..e463db01684e 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 = 6403718012684943969L;
+    private static final long serialVersionUID = 6403721300775837908L;
 }
diff --git a/slice2js/ruby/test/Ice/exceptions/Test.js b/slice2js/ruby/test/Ice/exceptions/Test.js
index 34fef4296a7c..8f3daba19c86 100644
--- a/slice2js/ruby/test/Ice/exceptions/Test.js
+++ b/slice2js/ruby/test/Ice/exceptions/Test.js
@@ -257,8 +257,8 @@ Ice.defineOperations(
         ], , ],
         "throwAorDasAorD": [, , , , [[3]], ,
         [
-            Test.A,
-            Test.D
+            Test.D,
+            Test.A
         ], , ],
         "throwBasA": [, , , , [[3], [3]], ,
         [
diff --git a/slice2js/slice/Glacier2/Router.js b/slice2js/slice/Glacier2/Router.js
index 74d00b20cb28..26cb6132c46c 100644
--- a/slice2js/slice/Glacier2/Router.js
+++ b/slice2js/slice/Glacier2/Router.js
@@ -119,13 +119,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/slice2swift/cpp/test/Ice/exceptions/TestAMD.swift b/slice2swift/cpp/test/Ice/exceptions/TestAMD.swift
index 687fc0472075..c83432c531fa 100644
--- a/slice2swift/cpp/test/Ice/exceptions/TestAMD.swift
+++ b/slice2swift/cpp/test/Ice/exceptions/TestAMD.swift
@@ -767,10 +767,10 @@ public extension ThrowerPrx {
                                        userException:{ ex in
                                            do  {
                                                throw ex
-                                           } catch let error as D {
-                                               throw error
                                            } catch let error as A {
                                                throw error
+                                           } catch let error as D {
+                                               throw error
                                            } catch is Ice.UserException {}
                                        },
                                        context: context)
diff --git a/slice2swift/csharp/test/Ice/exceptions/TestAMD.swift b/slice2swift/csharp/test/Ice/exceptions/TestAMD.swift
index 449c592da992..d58f25d9fa28 100644
--- a/slice2swift/csharp/test/Ice/exceptions/TestAMD.swift
+++ b/slice2swift/csharp/test/Ice/exceptions/TestAMD.swift
@@ -618,10 +618,10 @@ public extension ThrowerPrx {
                                        userException:{ ex in
                                            do  {
                                                throw ex
-                                           } catch let error as A {
-                                               throw error
                                            } catch let error as D {
                                                throw error
+                                           } catch let error as A {
+                                               throw error
                                            } catch is Ice.UserException {}
                                        },
                                        context: context)
diff --git a/slice2swift/slice/Glacier2/Router.swift b/slice2swift/slice/Glacier2/Router.swift
index 41bc1121d181..c14038eca5a8 100644
--- a/slice2swift/slice/Glacier2/Router.swift
+++ b/slice2swift/slice/Glacier2/Router.swift
@@ -256,10 +256,10 @@ public extension RouterPrx {
                                        userException:{ ex in
                                            do  {
                                                throw ex
-                                           } catch let error as CannotCreateSessionException {
-                                               throw error
                                            } catch let error as PermissionDeniedException {
                                                throw error
+                                           } catch let error as CannotCreateSessionException {
+                                               throw error
                                            } catch is Ice.UserException {}
                                        },
                                        context: context)
@@ -293,10 +293,10 @@ public extension RouterPrx {
                                        userException:{ ex in
                                            do  {
                                                throw ex
-                                           } catch let error as CannotCreateSessionException {
-                                               throw error
                                            } catch let error as PermissionDeniedException {
                                                throw error
+                                           } catch let error as CannotCreateSessionException {
+                                               throw error
                                            } catch is Ice.UserException {}
                                        },
                                        context: context)