diff --git a/slice2cpp/slice/IceBox/ServiceManager.cpp b/slice2cpp/slice/IceBox/ServiceManager.cpp
index a9de293a4902..04dd23f146b3 100644
--- a/slice2cpp/slice/IceBox/ServiceManager.cpp
+++ b/slice2cpp/slice/IceBox/ServiceManager.cpp
@@ -150,11 +150,11 @@ IceBox::ServiceManagerPrx::_iceI_startService(const ::std::shared_ptr<::IceInter
             {
                 ex.ice_throw();
             }
-            catch(const AlreadyStartedException&)
+            catch(const NoSuchServiceException&)
             {
                 throw;
             }
-            catch(const NoSuchServiceException&)
+            catch(const AlreadyStartedException&)
             {
                 throw;
             }
diff --git a/slice2cs/cpp/src/IceGrid/Internal.cs b/slice2cs/cpp/src/IceGrid/Internal.cs
index 52946fc7ff6b..3369b8f7bd83 100644
--- a/slice2cs/cpp/src/IceGrid/Internal.cs
+++ b/slice2cs/cpp/src/IceGrid/Internal.cs
@@ -5521,11 +5521,11 @@ private void _iceI_setAdapterDirectProxy(string iceP_adapterId, string iceP_repl
                     {
                         throw ex;
                     }
-                    catch(AdapterNotExistException)
+                    catch(AdapterExistsException)
                     {
                         throw;
                     }
-                    catch(AdapterExistsException)
+                    catch(AdapterNotExistException)
                     {
                         throw;
                     }
@@ -5924,11 +5924,11 @@ private void _iceI_registerNode(InternalNodeInfo? iceP_info, NodePrx? iceP_prx,
                     {
                         throw ex;
                     }
-                    catch(PermissionDeniedException)
+                    catch(NodeActiveException)
                     {
                         throw;
                     }
-                    catch(NodeActiveException)
+                    catch(PermissionDeniedException)
                     {
                         throw;
                     }
@@ -5980,11 +5980,11 @@ private void _iceI_registerReplica(InternalReplicaInfo? iceP_info, InternalRegis
                     {
                         throw ex;
                     }
-                    catch(PermissionDeniedException)
+                    catch(ReplicaActiveException)
                     {
                         throw;
                     }
-                    catch(ReplicaActiveException)
+                    catch(PermissionDeniedException)
                     {
                         throw;
                     }
diff --git a/slice2cs/csharp/test/Ice/operations/Test.cs b/slice2cs/csharp/test/Ice/operations/Test.cs
index 68c797c1f44d..7be4a6c7ce5c 100644
--- a/slice2cs/csharp/test/Ice/operations/Test.cs
+++ b/slice2cs/csharp/test/Ice/operations/Test.cs
@@ -13440,51 +13440,23 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, 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 global::System.Collections.Generic.Dictionary<byte, byte[]> opByteByteSD(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, out global::System.Collections.Generic.Dictionary<byte, byte[]> p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<bool, bool[]> opBoolBoolSD(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, out global::System.Collections.Generic.Dictionary<bool, bool[]> p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<int, int[]> opIntIntSD(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, out global::System.Collections.Generic.Dictionary<int, int[]> p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<long, long[]> opLongLongSD(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, out global::System.Collections.Generic.Dictionary<long, long[]> p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<string, float[]> opStringFloatSD(global::System.Collections.Generic.Dictionary<string, float[]> p1, global::System.Collections.Generic.Dictionary<string, float[]> p2, out global::System.Collections.Generic.Dictionary<string, float[]> p3, Ice.Current current);
-
-            public abstract 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 void shutdown(Ice.Current current);
 
-            public abstract byte opByte1(byte opByte1, Ice.Current current);
+            public abstract bool supportsCompress(Ice.Current current);
 
-            public abstract short opShort1(short opShort1, Ice.Current current);
+            public abstract void opVoid(Ice.Current current);
 
-            public abstract int opInt1(int opInt1, Ice.Current current);
+            public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
 
-            public abstract long opLong1(long opLong1, Ice.Current current);
+            public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
 
-            public abstract float opFloat1(float opFloat1, 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 opDouble1(double opDouble1, Ice.Current current);
+            public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
 
-            public abstract string opString1(string opString1, Ice.Current current);
+            public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
 
-            public abstract string[] opStringS1(string[] opStringS1, 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);
 
@@ -13530,55 +13502,83 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             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<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<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<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 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 string[] opStringLiterals(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 string[] opWStringLiterals(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 MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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 MyClass_OpMDict1MarshaledResult opMDict1(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 MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
+            public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
 
-            public abstract global::System.Collections.Generic.Dictionary<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<int, int[]> opIntIntSD(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, out global::System.Collections.Generic.Dictionary<int, int[]> p3, Ice.Current current);
 
-            public abstract global::System.Collections.Generic.Dictionary<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<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 void shutdown(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 bool supportsCompress(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 void opVoid(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 byte opByte(byte p1, byte p2, out byte 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 bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+            public abstract int[] opIntS(int[] s, 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 void opByteSOneway(byte[] s, 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 int opByteSOnewayCallCount(Ice.Current current);
 
-            public abstract int[] opIntS(int[] s, 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);
+
+            public abstract short opShort1(short opShort1, Ice.Current current);
+
+            public abstract int opInt1(int opInt1, Ice.Current current);
+
+            public abstract long opLong1(long opLong1, Ice.Current current);
+
+            public abstract float opFloat1(float opFloat1, Ice.Current current);
+
+            public abstract double opDouble1(double opDouble1, Ice.Current current);
+
+            public abstract string opString1(string opString1, Ice.Current current);
+
+            public abstract string[] opStringS1(string[] opStringS1, Ice.Current current);
+
+            public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
 
             public abstract string[] opStringS2(string[] stringS, Ice.Current current);
 
             public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
 
+            public abstract string[] opStringLiterals(Ice.Current current);
+
+            public abstract string[] opWStringLiterals(Ice.Current current);
+
             public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
 
             public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current);
 
             public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
 
-            public abstract 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 MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
 
-            public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
+            public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
+
+            public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
             public override string ice_id(Ice.Current current) => ice_staticId();
 
@@ -13674,51 +13674,23 @@ namespace Test2
 {
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract global::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, byte[]> opByteByteSD(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, out global::System.Collections.Generic.Dictionary<byte, byte[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<bool, bool[]> opBoolBoolSD(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, out global::System.Collections.Generic.Dictionary<bool, bool[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<int, int[]> opIntIntSD(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, out global::System.Collections.Generic.Dictionary<int, int[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, long[]> opLongLongSD(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, out global::System.Collections.Generic.Dictionary<long, long[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, float[]> opStringFloatSD(global::System.Collections.Generic.Dictionary<string, float[]> p1, global::System.Collections.Generic.Dictionary<string, float[]> p2, out global::System.Collections.Generic.Dictionary<string, float[]> p3, Ice.Current current);
-
-        public abstract 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 void shutdown(Ice.Current current);
 
-        public abstract byte opByte1(byte opByte1, Ice.Current current);
+        public abstract bool supportsCompress(Ice.Current current);
 
-        public abstract short opShort1(short opShort1, Ice.Current current);
+        public abstract void opVoid(Ice.Current current);
 
-        public abstract int opInt1(int opInt1, Ice.Current current);
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
 
-        public abstract long opLong1(long opLong1, Ice.Current current);
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
 
-        public abstract float opFloat1(float opFloat1, 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 opDouble1(double opDouble1, Ice.Current current);
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
 
-        public abstract string opString1(string opString1, Ice.Current current);
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
 
-        public abstract string[] opStringS1(string[] opStringS1, Ice.Current current);
+        public abstract global::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, Ice.Current current);
 
         public abstract global::Ice.operations.Test.MyClassPrx? opMyClass(global::Ice.operations.Test.MyClassPrx? p1, out global::Ice.operations.Test.MyClassPrx? p2, out global::Ice.operations.Test.MyClassPrx? p3, Ice.Current current);
 
@@ -13764,55 +13736,83 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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<string, global::Ice.operations.Test.MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, global::Ice.operations.Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, global::Ice.operations.Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, global::Ice.operations.Test.MyEnum>[] 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<global::Ice.operations.Test.MyEnum, global::Ice.operations.Test.MyEnum[]> opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, global::Ice.operations.Test.MyEnum[]> p1, global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, global::Ice.operations.Test.MyEnum[]> p2, out global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, global::Ice.operations.Test.MyEnum[]> 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 string[] opStringLiterals(Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<string, global::Ice.operations.Test.MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, global::Ice.operations.Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, global::Ice.operations.Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, global::Ice.operations.Test.MyEnum>[] p3, Ice.Current current);
 
-        public abstract string[] opWStringLiterals(Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyStruct, global::Ice.operations.Test.MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyStruct, global::Ice.operations.Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyStruct, global::Ice.operations.Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyStruct, global::Ice.operations.Test.MyEnum>[] p3, Ice.Current current);
 
-        public abstract global::Ice.operations.Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, 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::Ice.operations.Test.MyClass_OpMDict1MarshaledResult opMDict1(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::Ice.operations.Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<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<int, int[]> opIntIntSD(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, out global::System.Collections.Generic.Dictionary<int, int[]> p3, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<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<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 void shutdown(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 bool supportsCompress(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 void opVoid(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 byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, global::Ice.operations.Test.MyEnum[]> opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, global::Ice.operations.Test.MyEnum[]> p1, global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, global::Ice.operations.Test.MyEnum[]> p2, out global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, global::Ice.operations.Test.MyEnum[]> p3, Ice.Current current);
 
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+        public abstract int[] opIntS(int[] s, 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 void opByteSOneway(byte[] s, 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 int opByteSOnewayCallCount(Ice.Current current);
 
-        public abstract int[] opIntS(int[] s, 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);
+
+        public abstract short opShort1(short opShort1, Ice.Current current);
+
+        public abstract int opInt1(int opInt1, Ice.Current current);
+
+        public abstract long opLong1(long opLong1, Ice.Current current);
+
+        public abstract float opFloat1(float opFloat1, Ice.Current current);
+
+        public abstract double opDouble1(double opDouble1, Ice.Current current);
+
+        public abstract string opString1(string opString1, Ice.Current current);
+
+        public abstract string[] opStringS1(string[] opStringS1, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
 
         public abstract string[] opStringS2(string[] stringS, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
 
+        public abstract string[] opStringLiterals(Ice.Current current);
+
+        public abstract string[] opWStringLiterals(Ice.Current current);
+
         public abstract global::Ice.operations.Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
 
         public abstract global::Ice.operations.Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Ice.operations.Test.Structure p1, Ice.Current current);
 
         public abstract global::Ice.operations.Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] p3, Ice.Current current);
+        public abstract global::Ice.operations.Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
+        public abstract global::Ice.operations.Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
+
+        public abstract global::Ice.operations.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/csharp/test/Ice/operations/TestAMD.cs b/slice2cs/csharp/test/Ice/operations/TestAMD.cs
index d2aee4a20cb2..17df5d7cd722 100644
--- a/slice2cs/csharp/test/Ice/operations/TestAMD.cs
+++ b/slice2cs/csharp/test/Ice/operations/TestAMD.cs
@@ -9868,6 +9868,8 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyStruct1> opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current);
 
+            public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
+
             public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current);
@@ -9878,8 +9880,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongResult> opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current);
 
-            public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
-
             public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleResult> opFloatDoubleAsync(float p1, double p2, Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpStringResult> opStringAsync(string p1, string p2, Ice.Current current);
@@ -9892,6 +9892,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSResult> opByteSAsync(byte[] p1, byte[] p2, Ice.Current current);
 
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSResult> opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current);
+
             public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleSResult> opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpStringSResult> opStringSAsync(string[] p1, string[] p2, Ice.Current current);
@@ -9910,10 +9914,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpByteBoolDResult> opByteBoolDAsync(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_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSResult> opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current);
-
             public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntDResult> opShortIntDAsync(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_OpLongFloatDResult> opLongFloatDAsync(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, Ice.Current current);
diff --git a/slice2cs/ruby/test/Ice/location/Test.cs b/slice2cs/ruby/test/Ice/location/Test.cs
index 11a8a9e76a88..d68efdfb14f5 100644
--- a/slice2cs/ruby/test/Ice/location/Test.cs
+++ b/slice2cs/ruby/test/Ice/location/Test.cs
@@ -186,11 +186,11 @@ private void _iceI_setAdapterDirectProxy(string iceP_id, global::Ice.ObjectPrx?
                     {
                         throw ex;
                     }
-                    catch(global::Ice.AdapterAlreadyActiveException)
+                    catch(global::Ice.AdapterNotFoundException)
                     {
                         throw;
                     }
-                    catch(global::Ice.AdapterNotFoundException)
+                    catch(global::Ice.AdapterAlreadyActiveException)
                     {
                         throw;
                     }
@@ -236,15 +236,15 @@ private void _iceI_setReplicatedAdapterDirectProxy(string iceP_adapterId, string
                     {
                         throw ex;
                     }
-                    catch(global::Ice.InvalidReplicaGroupIdException)
+                    catch(global::Ice.AdapterNotFoundException)
                     {
                         throw;
                     }
-                    catch(global::Ice.AdapterAlreadyActiveException)
+                    catch(global::Ice.InvalidReplicaGroupIdException)
                     {
                         throw;
                     }
-                    catch(global::Ice.AdapterNotFoundException)
+                    catch(global::Ice.AdapterAlreadyActiveException)
                     {
                         throw;
                     }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java
index ecbd9065b933..4645ab58648c 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java
@@ -224,5 +224,5 @@ static public java.util.Optional<DataSample> ice_read(com.zeroc.Ice.InputStream
     private static final DataSample _nullMarshalValue = new DataSample();
 
     /** @hidden */
-    private static final long serialVersionUID = -2004457903365208066L;
+    private static final long serialVersionUID = -7148730518289522987L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java
index 0f9a0bd344c4..9c29ba59523f 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java
@@ -155,5 +155,5 @@ static public java.util.Optional<DataSamples> ice_read(com.zeroc.Ice.InputStream
     private static final DataSamples _nullMarshalValue = new DataSamples();
 
     /** @hidden */
-    private static final long serialVersionUID = -5577050915105203878L;
+    private static final long serialVersionUID = -494851609282195701L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java
index 22ac302815ab..d91be7863efb 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java
@@ -424,7 +424,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3961881929226884986L;
+    private static final long serialVersionUID = 1507061936258265852L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java
index d0d40c9e86ef..a0b69abf6fb2 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java
@@ -174,5 +174,5 @@ static public java.util.Optional<ElementData> ice_read(com.zeroc.Ice.InputStream
     private static final ElementData _nullMarshalValue = new ElementData();
 
     /** @hidden */
-    private static final long serialVersionUID = 7859619215011069752L;
+    private static final long serialVersionUID = -4284577807096313438L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java
index e03718ecb510..9450dd22c49f 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java
@@ -200,5 +200,5 @@ static public java.util.Optional<ElementDataAck> ice_read(com.zeroc.Ice.InputStr
     private static final ElementDataAck _nullMarshalValue = new ElementDataAck();
 
     /** @hidden */
-    private static final long serialVersionUID = 5108687161682778226L;
+    private static final long serialVersionUID = -3542590017335606759L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java
index 078497aec977..65faf9640bd1 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java
@@ -172,5 +172,5 @@ static public java.util.Optional<ElementInfo> ice_read(com.zeroc.Ice.InputStream
     private static final ElementInfo _nullMarshalValue = new ElementInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -354161950524300988L;
+    private static final long serialVersionUID = -4310365953351834408L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java
index 873b13b5bc4a..48b2ff4ef06b 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java
@@ -215,5 +215,5 @@ static public java.util.Optional<ElementSpec> ice_read(com.zeroc.Ice.InputStream
     private static final ElementSpec _nullMarshalValue = new ElementSpec();
 
     /** @hidden */
-    private static final long serialVersionUID = 2746108234682905028L;
+    private static final long serialVersionUID = 4455385281233960700L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java
index ab03b1668dce..da3c7431f3c7 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java
@@ -215,5 +215,5 @@ static public java.util.Optional<ElementSpecAck> ice_read(com.zeroc.Ice.InputStr
     private static final ElementSpecAck _nullMarshalValue = new ElementSpecAck();
 
     /** @hidden */
-    private static final long serialVersionUID = -2802720719193131830L;
+    private static final long serialVersionUID = 7954515353669077754L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java
index 92521c930ce8..d790fb04189e 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java
@@ -153,5 +153,5 @@ static public java.util.Optional<FilterInfo> ice_read(com.zeroc.Ice.InputStream
     private static final FilterInfo _nullMarshalValue = new FilterInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 6499178522850816502L;
+    private static final long serialVersionUID = 8535663660358192201L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java
index bee663913eea..f1f2d2af825e 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java
@@ -159,5 +159,5 @@ static public java.util.Optional<TopicInfo> ice_read(com.zeroc.Ice.InputStream i
     private static final TopicInfo _nullMarshalValue = new TopicInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 7889463203428758612L;
+    private static final long serialVersionUID = -6397851842842099367L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java
index 4a75a71b50e4..c840eb6028bb 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java
@@ -185,5 +185,5 @@ static public java.util.Optional<TopicSpec> ice_read(com.zeroc.Ice.InputStream i
     private static final TopicSpec _nullMarshalValue = new TopicSpec();
 
     /** @hidden */
-    private static final long serialVersionUID = -186128168391674319L;
+    private static final long serialVersionUID = 7380465135417149572L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java
index 0f6bf56bd24f..5865386cc5a0 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 = 3774317193927409948L;
+    private static final long serialVersionUID = 3774321269731457198L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java
index 32e8baef6559..40dc6110ec4e 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 = 7872703495623158625L;
+    private static final long serialVersionUID = 7872702111119878328L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java
index 3a27dc10e907..d40652cdc6d7 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 = 594022330285831986L;
+    private static final long serialVersionUID = -380946162175864615L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java
index 2d3d9edda059..fb58b08ff749 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 = -5063840936401403627L;
+    private static final long serialVersionUID = 1367202583304267491L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
index 82d002251209..ff911504c906 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
@@ -196,7 +196,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3247686098562578888L;
+    private static final long serialVersionUID = -8786943976138952846L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java
index 1b94d425d5f5..7da97e2b8278 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 = 8944127105771955516L;
+    private static final long serialVersionUID = -6023433749593590020L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java
index a95c0587d783..974cc446c2ac 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 = 4445893790968470316L;
+    private static final long serialVersionUID = -1257166433704442345L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java
index 6dda15983459..216f56db0507 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 = -1960902246241915721L;
+    private static final long serialVersionUID = -313902791270600425L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java
index 7bf988ec2b06..0c162fff021a 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 = 4291816882296087093L;
+    private static final long serialVersionUID = 1383657461710764116L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java
index 111d35ecbb9f..e4e6cf8d9f77 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 = -3302313479959552548L;
+    private static final long serialVersionUID = 5017833574612552467L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java
index 3d22506fc3ca..85b6ee2e04e2 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 = -870393169378783758L;
+    private static final long serialVersionUID = 1865804894705577238L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java
index 2fb0eeac769a..0397510c8ece 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 = 8998566020199341343L;
+    private static final long serialVersionUID = 3398868022719983839L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java
index 426a10d38e1a..dbad22d213db 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 = -1225569543259094081L;
+    private static final long serialVersionUID = -2952468980048936300L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java
index 4fd8200f00ea..8aac94187239 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 = 705809845220870852L;
+    private static final long serialVersionUID = -3950062066412608604L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java
index d6c1d577cf25..0bdc5da2f0d6 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 = 3454075547213801340L;
+    private static final long serialVersionUID = 2353025397664385070L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java
index 350b3509a817..d91881d1fe30 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 = 938916114210354718L;
+    private static final long serialVersionUID = 938915915531213381L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java
index b5b8f9809c1a..dfddb237b2fa 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 = 4151879864620266410L;
+    private static final long serialVersionUID = 108588510061187594L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java
index 20f469f0c6eb..4b6622e27af3 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 = -6534840054319342651L;
+    private static final long serialVersionUID = -8841525952174545191L;
 }
diff --git a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java
index 5847e2b12d9b..ec04c1b7f489 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 = -2318219210785017412L;
+    private static final long serialVersionUID = 1748339054101725992L;
 }
diff --git a/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java b/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java
index db0a409f7850..e83ebc2eb7dc 100644
--- a/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java
+++ b/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1632402483383028763L;
+    private static final long serialVersionUID = 1632390602922858776L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/api/Test/StructKey.java b/slice2java/cpp/test/DataStorm/api/Test/StructKey.java
index dee580553e6a..f17cc0abf240 100644
--- a/slice2java/cpp/test/DataStorm/api/Test/StructKey.java
+++ b/slice2java/cpp/test/DataStorm/api/Test/StructKey.java
@@ -138,5 +138,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = -8144777649000760117L;
+    private static final long serialVersionUID = -8144782382325424440L;
 }
diff --git a/slice2java/cpp/test/DataStorm/events/Test/Base.java b/slice2java/cpp/test/DataStorm/events/Test/Base.java
index 7f1e5d1fd92d..1e39d018b1ba 100644
--- a/slice2java/cpp/test/DataStorm/events/Test/Base.java
+++ b/slice2java/cpp/test/DataStorm/events/Test/Base.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2623895007626172672L;
+    private static final long serialVersionUID = -2623901861516002078L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/events/Test/Extended.java b/slice2java/cpp/test/DataStorm/events/Test/Extended.java
index c3783dfc8f93..30e09bfd4350 100644
--- a/slice2java/cpp/test/DataStorm/events/Test/Extended.java
+++ b/slice2java/cpp/test/DataStorm/events/Test/Extended.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2516995037543873905L;
+    private static final long serialVersionUID = 2516993814432243625L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/events/Test/StructValue.java b/slice2java/cpp/test/DataStorm/events/Test/StructValue.java
index 082754d74ba3..031c2aba2ebb 100644
--- a/slice2java/cpp/test/DataStorm/events/Test/StructValue.java
+++ b/slice2java/cpp/test/DataStorm/events/Test/StructValue.java
@@ -167,5 +167,5 @@ static public java.util.Optional<StructValue> ice_read(com.zeroc.Ice.InputStream
     private static final StructValue _nullMarshalValue = new StructValue();
 
     /** @hidden */
-    private static final long serialVersionUID = -7938866659900310890L;
+    private static final long serialVersionUID = 8842696599381777742L;
 }
diff --git a/slice2java/cpp/test/DataStorm/partial/Test/Stock.java b/slice2java/cpp/test/DataStorm/partial/Test/Stock.java
index cca53dbb1d69..d0c380c55c5a 100644
--- a/slice2java/cpp/test/DataStorm/partial/Test/Stock.java
+++ b/slice2java/cpp/test/DataStorm/partial/Test/Stock.java
@@ -158,5 +158,5 @@ static public java.util.Optional<Stock> ice_read(com.zeroc.Ice.InputStream istr,
     private static final Stock _nullMarshalValue = new Stock();
 
     /** @hidden */
-    private static final long serialVersionUID = 6456142992605850957L;
+    private static final long serialVersionUID = 824765356611485516L;
 }
diff --git a/slice2java/cpp/test/DataStorm/types/Test/Base.java b/slice2java/cpp/test/DataStorm/types/Test/Base.java
index f7b2e79c2e9f..e1945bd0cd0d 100644
--- a/slice2java/cpp/test/DataStorm/types/Test/Base.java
+++ b/slice2java/cpp/test/DataStorm/types/Test/Base.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2623898937470949237L;
+    private static final long serialVersionUID = -2623897877270205525L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/types/Test/Extended.java b/slice2java/cpp/test/DataStorm/types/Test/Extended.java
index 691107c536c1..6ccc2e18ef9a 100644
--- a/slice2java/cpp/test/DataStorm/types/Test/Extended.java
+++ b/slice2java/cpp/test/DataStorm/types/Test/Extended.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2516990947544945732L;
+    private static final long serialVersionUID = 2516997744307589131L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/types/Test/StructValue.java b/slice2java/cpp/test/DataStorm/types/Test/StructValue.java
index a179df9bcc48..437e34b6be19 100644
--- a/slice2java/cpp/test/DataStorm/types/Test/StructValue.java
+++ b/slice2java/cpp/test/DataStorm/types/Test/StructValue.java
@@ -167,5 +167,5 @@ static public java.util.Optional<StructValue> ice_read(com.zeroc.Ice.InputStream
     private static final StructValue _nullMarshalValue = new StructValue();
 
     /** @hidden */
-    private static final long serialVersionUID = 1277554335509060131L;
+    private static final long serialVersionUID = 6444556958941033516L;
 }
diff --git a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java
index 2f9c7e883408..e92f312bcd03 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 = -7113285077354725318L;
+    private static final long serialVersionUID = -2716931235800828154L;
 }
diff --git a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java
index d7c3842710b5..baa09ef3a626 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 = -5875601445074476142L;
+    private static final long serialVersionUID = -2779804356496986882L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java
index ea41bb51e105..f616be5f5925 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 = 1702549458895711553L;
+    private static final long serialVersionUID = -6835622864407165417L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/DictClass.java b/slice2java/cpp/test/Ice/custom/Test/DictClass.java
index b13d630be7ca..5eb7e256ce9e 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 = 6545927074509692489L;
+    private static final long serialVersionUID = 6545917196050054033L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/custom/Test/Fixed.java b/slice2java/cpp/test/Ice/custom/Test/Fixed.java
index c6299372faa8..3edfdd978834 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 = -5072321801311308039L;
+    private static final long serialVersionUID = -5072326055478454704L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/Variable.java b/slice2java/cpp/test/Ice/custom/Test/Variable.java
index 931f50060e6d..cb1c1cf08401 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 = 8324316161430085480L;
+    private static final long serialVersionUID = 5741956192174103093L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java
index 565b1b586969..8a7b288ba464 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 = 1345710002806775363L;
+    private static final long serialVersionUID = 1345709782027599031L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java
index ccbd13cba1fa..a529c3ae5c62 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 = -6616022666587218796L;
+    private static final long serialVersionUID = -6616022611134481760L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java
index 0fd7122112c2..dd4faade983d 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 = 4583029208199268160L;
+    private static final long serialVersionUID = 4583029147562329332L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java
index 14144bea8c58..412c42cbbc91 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 = 5997335526988025367L;
+    private static final long serialVersionUID = 5997335752914325219L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java
index 9ce67c598546..c9dc1b75f270 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 = 499791073959136366L;
+    private static final long serialVersionUID = -393192736056382874L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java
index 224c9dd0bcdc..68b479795494 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 = -2121998201184908518L;
+    private static final long serialVersionUID = -1092010389438559342L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java
index 69f9be4feeb4..df7611653abc 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 = 2276517241687105805L;
+    private static final long serialVersionUID = -9181577079859200329L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java
index 418168e59a5c..9bf248a76dda 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 = 2479490779871210682L;
+    private static final long serialVersionUID = 3272366502154312704L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java
index 8d4d03298033..7105a33648e7 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 = 6944359249905846147L;
+    private static final long serialVersionUID = 3951264533252144945L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java
index de48cc0f6cdc..a3fe69049119 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 = 5159600131504248030L;
+    private static final long serialVersionUID = -4000904930987564179L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java
index 2aacbb550f7f..1bf901528850 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 = -6071103852739507199L;
+    private static final long serialVersionUID = -3104584927871566797L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/A.java b/slice2java/cpp/test/Ice/exceptions/Test/A.java
index a5dfb49299bd..6065be91cb80 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 = 7823738686664997224L;
+    private static final long serialVersionUID = 7823741846648107298L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/B.java b/slice2java/cpp/test/Ice/exceptions/Test/B.java
index 1c66177d7fdd..77ea9dd079af 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 = -3861417211851618392L;
+    private static final long serialVersionUID = -3861419507024609182L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/C.java b/slice2java/cpp/test/Ice/exceptions/Test/C.java
index 0415eec84509..a82684e854bf 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 = 1080692377867782504L;
+    private static final long serialVersionUID = 1080695537850892578L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/D.java b/slice2java/cpp/test/Ice/exceptions/Test/D.java
index 2fad8e76c12a..ef10095276b5 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 = 4780375056250459816L;
+    private static final long serialVersionUID = 4780372761077469026L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/E.java b/slice2java/cpp/test/Ice/exceptions/Test/E.java
index df2844616132..c0f5e998feba 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 = -1876980140859758785L;
+    private static final long serialVersionUID = -1876978103991253983L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/F.java b/slice2java/cpp/test/Ice/exceptions/Test/F.java
index e4b4b1292c02..ad9b14ce8faf 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 = 733476891536726268L;
+    private static final long serialVersionUID = 733479181367424994L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java
index 9cd089aeb41a..b88c58aaaae6 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 = -4641409588672763908L;
+    private static final long serialVersionUID = -4641407722568573002L;
 }
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java
index cfa0bdd4ce99..820f5093835f 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 = 954229733617722477L;
+    private static final long serialVersionUID = 954232237810522451L;
 
     /** @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 6fb84142b711..4ae9254ddba7 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 = 1339633320713759991L;
+    private static final long serialVersionUID = 1339641241248380361L;
 
     /** @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 753b47e70982..b79822d69507 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 = -2729306800426281995L;
+    private static final long serialVersionUID = -2729304335056958261L;
 
     /** @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 5dc13e7ff23a..67ab285e34c1 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 = -3435398858885811725L;
+    private static final long serialVersionUID = -3435401528379337267L;
 
     /** @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 4751827c3704..307f81344d0d 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 = -836181157373332438L;
+    private static final long serialVersionUID = -836183788055016620L;
 
     /** @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 c6a6cec8dd0d..fac816ca12d9 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 = 1132522118063361559L;
+    private static final long serialVersionUID = 1132530038588507625L;
 
     /** @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 70d0a5244d6f..d38fd6731767 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 = -6335555643230647531L;
+    private static final long serialVersionUID = -6335553177861598229L;
 
     /** @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 57c0c668c4bc..c7858b9f64a8 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 = -4007410565154749933L;
+    private static final long serialVersionUID = -4007413234657749779L;
 
     /** @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 dfeae709632b..aaabc7a39a5b 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 = 991428696441203307L;
+    private static final long serialVersionUID = 991426065771154005L;
 
     /** @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 483a067cb362..cdea3d73428c 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 = -2880334791419212617L;
+    private static final long serialVersionUID = -2880326705581431543L;
 
     /** @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 07cdc2139a12..e6088c49a27e 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 = -8808268127952677963L;
+    private static final long serialVersionUID = -8808265497270993653L;
 
     /** @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 a02ebed922b3..03125527f399 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 = -771853770461338957L;
+    private static final long serialVersionUID = -771856274651703795L;
 
     /** @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 32fcf08b8cc2..9e8970f9b77e 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 = 6566354728929856040L;
+    private static final long serialVersionUID = 6566346643092075094L;
 
     /** @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 da249fc8c670..d25afc4a5639 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 = 6983798867883674327L;
+    private static final long serialVersionUID = 6983806953721459497L;
 
     /** @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 4f1ecd4fa2ff..4923628d96b1 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 = -1175219987774026539L;
+    private static final long serialVersionUID = -1175217357101538005L;
 
     /** @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 065c6b9ac35e..43856b369b50 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 = -3279719028351413805L;
+    private static final long serialVersionUID = -3279721532541774547L;
 
     /** @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 f125284cef60..6f03af1cc24e 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 = -4359171676774867095L;
+    private static final long serialVersionUID = -4359179762610213033L;
 
     /** @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 79ab19290549..497f33617cf6 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 = 5904690108265148023L;
+    private static final long serialVersionUID = 5904698028799768393L;
 
     /** @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 dbb24227f5a3..7ba25e30ca29 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 = 1835749987125106037L;
+    private static final long serialVersionUID = 1835752452494429771L;
 
     /** @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 13a742147ae8..207cd72e6e9d 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 = -2252399512116128909L;
+    private static final long serialVersionUID = -2252402181609654451L;
 
     /** @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 dee7ea2e9aa9..081d623124bf 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 = -1203539590027291866L;
+    private static final long serialVersionUID = -1203531630680813736L;
 
     /** @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 ed7f4a9758e2..1579d9b133c0 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 = -7537769913523923561L;
+    private static final long serialVersionUID = -7537761992998777495L;
 
     /** @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 5a8d5f6bc03e..0d69a4c3d3d3 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 = 3440896398891618965L;
+    private static final long serialVersionUID = 3440898864260668267L;
 
     /** @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 29c3de09abf6..fb7bc63a5447 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 = 9151098917749221779L;
+    private static final long serialVersionUID = 9151096248246221933L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/library/Test/UserError.java b/slice2java/cpp/test/Ice/library/Test/UserError.java
index c76e91fcf6c8..ff1f53595d6d 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 = -1126955889156992712L;
+    private static final long serialVersionUID = -1126954076095339313L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/A.java b/slice2java/cpp/test/Ice/objects/Test/A.java
index f727245288d4..d397c751e794 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 = -4004678942688198301L;
+    private static final long serialVersionUID = 6787324471071139105L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/A1.java b/slice2java/cpp/test/Ice/objects/Test/A1.java
index bf0370d6f58a..3a77c4beddfb 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 = -5926748570485659228L;
+    private static final long serialVersionUID = -5926745213888497218L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/B.java b/slice2java/cpp/test/Ice/objects/Test/B.java
index ccc7e9c2fcdb..a4db2377f2ac 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 = -8890916124025341483L;
+    private static final long serialVersionUID = -8890916422430458375L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/B1.java b/slice2java/cpp/test/Ice/objects/Test/B1.java
index e36bdfa7234b..280182fcbd31 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 = -2085419797803805372L;
+    private static final long serialVersionUID = 2178651047623730628L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Base.java b/slice2java/cpp/test/Ice/objects/Test/Base.java
index 92ac8c19d656..3313d387d66e 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 = -3661893028095354480L;
+    private static final long serialVersionUID = -2417513073866897884L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java
index f1da11def075..5260b24edd2b 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 = 3897766628422326902L;
+    private static final long serialVersionUID = 3897765818591874796L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/C.java b/slice2java/cpp/test/Ice/objects/Test/C.java
index f30718ca3db5..580e89bae3e5 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 = 5744684228521680771L;
+    private static final long serialVersionUID = -5971785007885640997L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/COneMember.java b/slice2java/cpp/test/Ice/objects/Test/COneMember.java
index 4df4e5d44a9d..754d828d4cdd 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 = 3050974814652836313L;
+    private static final long serialVersionUID = 3050969653036120321L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java
index f9fa946641a6..4016c35499eb 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 = -5741341652889954213L;
+    private static final long serialVersionUID = 45887574399606875L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/D.java b/slice2java/cpp/test/Ice/objects/Test/D.java
index 2b87910f4ef5..66d3ab124f56 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 = -6682931823846802830L;
+    private static final long serialVersionUID = -4875090405407807524L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/D1.java b/slice2java/cpp/test/Ice/objects/Test/D1.java
index ab0e458537b7..b5ecb120a7c8 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 = -1487127852659802237L;
+    private static final long serialVersionUID = 485326645941578755L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Derived.java b/slice2java/cpp/test/Ice/objects/Test/Derived.java
index 4b8c950116ca..9f0f39fc3566 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 = -1587930608458132250L;
+    private static final long serialVersionUID = -1587931146926625163L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/E.java b/slice2java/cpp/test/Ice/objects/Test/E.java
index 5acc97134ca9..fe899c473782 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 = -6703884720654400193L;
+    private static final long serialVersionUID = 3554221236628372132L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/EBase.java b/slice2java/cpp/test/Ice/objects/Test/EBase.java
index 95cdf83620d8..b026b2fca740 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 = 3700800562067490574L;
+    private static final long serialVersionUID = -3312779940002273138L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/EDerived.java b/slice2java/cpp/test/Ice/objects/Test/EDerived.java
index bbf23e7b6a64..cadc7c4f742d 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 = 4103184250893932690L;
+    private static final long serialVersionUID = -2423423271013911022L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java
index 274c8fa40c41..9a901fd76c29 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 = -6225289997042357290L;
+    private static final long serialVersionUID = -6225291408691703794L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java
index 1cd9821a3205..494e754e6240 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 = 2039807864478487124L;
+    private static final long serialVersionUID = 2640048398979823444L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/F.java b/slice2java/cpp/test/Ice/objects/Test/F.java
index c45c70903d28..77a204a148f6 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 = 6219939546546604305L;
+    private static final long serialVersionUID = -3492930443571388207L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/F1.java b/slice2java/cpp/test/Ice/objects/Test/F1.java
index 98d55268cc7c..12b7998f6e24 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 = 6192376257688262765L;
+    private static final long serialVersionUID = 6192376172284107436L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/F3.java b/slice2java/cpp/test/Ice/objects/Test/F3.java
index ef75448ba0b6..93e26b386804 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 = -590770446555312964L;
+    private static final long serialVersionUID = -3130726751821246137L;
 
     /** @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 8e016ec38b29..b82c66b3d8c4 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 = -1425263524332727937L;
+    private static final long serialVersionUID = -1425258884164195309L;
 
     /** @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 0e68cd098085..fc4055f56612 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 = -2337232368824554979L;
+    private static final long serialVersionUID = -2337224484645647609L;
 }
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 e9ea986e608a..d37a1382e719 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 = -1298681592995155638L;
+    private static final long serialVersionUID = -1298677454027517872L;
 
     /** @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 5e420a686ca2..140492bf7c3f 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 = 1842235260769411897L;
+    private static final long serialVersionUID = 1842232064466084643L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/K.java b/slice2java/cpp/test/Ice/objects/Test/K.java
index 1a2a7fd85307..e7dda7aa7e73 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 = 4645165037979714602L;
+    private static final long serialVersionUID = 4645161004638888114L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/L.java b/slice2java/cpp/test/Ice/objects/Test/L.java
index 6273818ee747..99adbea2280b 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 = 6629741532623202095L;
+    private static final long serialVersionUID = 6629737388534314293L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/M.java b/slice2java/cpp/test/Ice/objects/Test/M.java
index da8589592bc9..457085915e72 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 = -8088100376438831472L;
+    private static final long serialVersionUID = -8088091213549486582L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Recursive.java b/slice2java/cpp/test/Ice/objects/Test/Recursive.java
index a53b2c1e6e3c..547caf8ce198 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 = 3617880120889196279L;
+    private static final long serialVersionUID = 3617877100064936557L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/S.java b/slice2java/cpp/test/Ice/objects/Test/S.java
index db6102521cf4..134561a24737 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 = 481768772704527004L;
+    private static final long serialVersionUID = 481768469137722118L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java
index d6f7a325b43a..e77ae261a3c9 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 = 6227750248829851968L;
+    private static final long serialVersionUID = 6227760695589034264L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java
index 52a7e1e4ab06..0a4ce2d196a1 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 = -8275050422990751550L;
+    private static final long serialVersionUID = 6994420388012789442L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/StructKey.java b/slice2java/cpp/test/Ice/objects/Test/StructKey.java
index a97c5aa001e9..60ef6d2efb80 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 = -5112901380052349197L;
+    private static final long serialVersionUID = -8782900278919372056L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java
index ec976d11d0fb..9125ec4fd664 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 = 2723848455118277103L;
+    private static final long serialVersionUID = 2723849795653809274L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java
index fda97b40bf0e..17b366abdcae 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 = 2523101889934972998L;
+    private static final long serialVersionUID = -8951977726558533865L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java
index 51079f97692d..ad6ac5300603 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 = 7045621716139491197L;
+    private static final long serialVersionUID = 1796782614647101341L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java
index 320c8e64b239..63bd7094ea01 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 = -4967325240653569553L;
+    private static final long serialVersionUID = 7435384826250617662L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/Structure.java b/slice2java/cpp/test/Ice/operations/Test/Structure.java
index 102a41d91e10..a58997ec2460 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 = -5885496760748080788L;
+    private static final long serialVersionUID = 6327579616205126404L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/A.java b/slice2java/cpp/test/Ice/optional/Test/A.java
index 26af55a03994..ec0b2649203c 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 = 3669535380751765776L;
+    private static final long serialVersionUID = 4926647030636970896L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/B.java b/slice2java/cpp/test/Ice/optional/Test/B.java
index f40c8919693c..61f1e3cfaef5 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 = -895263603614352093L;
+    private static final long serialVersionUID = 6469423599740426083L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/C.java b/slice2java/cpp/test/Ice/optional/Test/C.java
index 8025c067a573..12e36635b0da 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 = -2591868118936279235L;
+    private static final long serialVersionUID = 5192902519043425981L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java
index 3fa82fbf2986..1390467f00ed 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 = 5934520158132356466L;
+    private static final long serialVersionUID = 6793714641876315960L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/E.java b/slice2java/cpp/test/Ice/optional/Test/E.java
index 021bbd84db63..a4293212fad1 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 = -1850739347889078281L;
+    private static final long serialVersionUID = -1850730396768462170L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/F.java b/slice2java/cpp/test/Ice/optional/Test/F.java
index 5483a7946781..8225b561843c 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 = -6430492942278312572L;
+    private static final long serialVersionUID = -6430490978077679147L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java
index 2e3a34dad54f..ea424be95e23 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 = 1569601275779845386L;
+    private static final long serialVersionUID = 1569617038227001427L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/G.java b/slice2java/cpp/test/Ice/optional/Test/G.java
index bfa94cbc40a3..05f4153abeea 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 = 4873577283161606099L;
+    private static final long serialVersionUID = 510141883032295123L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/G1.java b/slice2java/cpp/test/Ice/optional/Test/G1.java
index ecd2631ea67b..933388bf490b 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 = 7339784711932780348L;
+    private static final long serialVersionUID = 7339779859695233270L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/G2.java b/slice2java/cpp/test/Ice/optional/Test/G2.java
index 7cc8f42b51ae..368b8d482799 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 = 3824551265454184936L;
+    private static final long serialVersionUID = 3824560216573406174L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java
index 8fdfc5143481..2c27a8550579 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 = 3931082110066709945L;
+    private static final long serialVersionUID = 4165644798069875688L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java
index f41cee7c6463..dec5a09dcf66 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 = -7219599322095548508L;
+    private static final long serialVersionUID = -7219605375134508419L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java
index bb313c9509d1..735caa1344cd 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 = -9142016813341620034L;
+    private static final long serialVersionUID = -3616999374728517553L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java
index f4c4b8db048c..4938dcff413a 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 = 8697335075230866491L;
+    private static final long serialVersionUID = 2503033951644812091L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java
index fbb7526d65f7..2641ac7e9b04 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 = 2894238490013873973L;
+    private static final long serialVersionUID = 2894241980659636479L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java
index 04de4e68e4b7..3f62cdcff2ba 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 = 6700987966921151608L;
+    private static final long serialVersionUID = 6700995386288495901L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java
index f37ac1abac86..265ee766a97a 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 = -1912284155651381068L;
+    private static final long serialVersionUID = -1912289007888911746L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/WD.java b/slice2java/cpp/test/Ice/optional/Test/WD.java
index a2ab8ad39d1a..a59990e7c349 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 = -4635403084858532072L;
+    private static final long serialVersionUID = -2381938477422303893L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C.java b/slice2java/cpp/test/Ice/scope/Test/C.java
index e74206ff4c6c..a514e5c044bf 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 = -5190248734397319483L;
+    private static final long serialVersionUID = -5190245625911971608L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C1.java b/slice2java/cpp/test/Ice/scope/Test/C1.java
index b0dfee0cfa42..95b58dac09ce 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 = 8893234476658248452L;
+    private static final long serialVersionUID = 8893237665219349865L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C2.java b/slice2java/cpp/test/Ice/scope/Test/C2.java
index d2f93413fe29..7ea205fab9a1 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 = -6630247088032998011L;
+    private static final long serialVersionUID = -8608705660788084502L;
 
     /** @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 5207948cb742..6e99bb87d785 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 = 4615627028106189460L;
+    private static final long serialVersionUID = 4615626629187810253L;
 
     /** @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 56cd35751610..eeaa450e78d8 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 = 672592871648573802L;
+    private static final long serialVersionUID = 672593309428359056L;
 
     /** @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 c435cbd561cf..a558fda8670c 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 = 8654438158048796833L;
+    private static final long serialVersionUID = 8654434969336447344L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java
index e69060a1664b..2b445952a9ad 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 = 3694620139738480877L;
+    private static final long serialVersionUID = 3694617632920504380L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S.java b/slice2java/cpp/test/Ice/scope/Test/S.java
index ccdb56a66d10..3fbb400d0971 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 = 2159701307554121555L;
+    private static final long serialVersionUID = 2159703734296553474L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S1.java b/slice2java/cpp/test/Ice/scope/Test/S1.java
index 396b494d9ad5..a9d4953df60c 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 = 1241678758368729661L;
+    private static final long serialVersionUID = 1241681515726728400L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S2.java b/slice2java/cpp/test/Ice/scope/Test/S2.java
index b7605432d149..caa3edcbac11 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 = 7760131709750829180L;
+    private static final long serialVersionUID = 2668433272412237331L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java
index f21c2cadf7e4..b9c26491631d 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 = -477021756411101229L;
+    private static final long serialVersionUID = -477023778854811269L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 50b3f1181fa4..47d68b921b0e 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 = 3485210853874549109L;
+    private static final long serialVersionUID = 3485214446747925661L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 700f088b003d..65b1c8b090cb 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 = 1717376034651458436L;
+    private static final long serialVersionUID = 1717377891635347692L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 0d689f348c56..dbfea52a93d5 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 = -7384921961008170019L;
+    private static final long serialVersionUID = -7384918538603973131L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index c9b850332c00..bb5504e62395 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 = 3424380166626984497L;
+    private static final long serialVersionUID = 3424380519105363054L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 272bc3c38a87..5fda1d0b81ef 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 = -1172598075369218144L;
+    private static final long serialVersionUID = -1172597730473868929L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 5a9d1b3ece38..297538f90c45 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 = -1126108708873759399L;
+    private static final long serialVersionUID = -1126109043295054458L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index 155308e9581a..364445e7602b 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 = -2097572888895621575L;
+    private static final long serialVersionUID = -2097573218312329626L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java
index e7c5f9dd6722..e3bded664654 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 = -887783071772402523L;
+    private static final long serialVersionUID = 4743900987929120694L;
 
     /** @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 872c975f0104..47376d7d7bff 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 = -7129603880055814551L;
+    private static final long serialVersionUID = 8815865406806245370L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java
index e94a6ac703d4..1832eb627f19 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 = -6396997840937143411L;
+    private static final long serialVersionUID = -6397006092006656543L;
 
     /** @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 a6fe40d2b9a0..6aadcdbe09d1 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 = -9066888223157687688L;
+    private static final long serialVersionUID = -9066887858968324268L;
 
     /** @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 7ea3cd8b0be8..e16302cfb070 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 = -8041255948977832026L;
+    private static final long serialVersionUID = 1817471751876749525L;
 
     /** @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 da2d360f2ffd..ecc1041af310 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 = 5154673488706719877L;
+    private static final long serialVersionUID = -2547235289810606231L;
 
     /** @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 050b68c86cf9..3ddeda997ca9 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 = 1439678115369223224L;
+    private static final long serialVersionUID = -1915129307489308692L;
 
     /** @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 69e0d3955b7f..f9d64892e70f 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 = 3881179163211253875L;
+    private static final long serialVersionUID = 96011037307345523L;
 
     /** @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 787e5ac15d05..c318122f3abe 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 = -7536421010429137579L;
+    private static final long serialVersionUID = 8788616929795218150L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java
index 983e3684c7d2..5c1f81c3f2e3 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 = -7655927257360104993L;
+    private static final long serialVersionUID = -7655927120621607693L;
 
     /** @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 7325e3ed4be9..1572480e2297 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 = -2271124602564672928L;
+    private static final long serialVersionUID = -2271124904611066036L;
 
     /** @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 aac7760da94b..7a87a1e736d0 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 = 4147528855808957897L;
+    private static final long serialVersionUID = 4147534839100599386L;
 
     /** @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 354de18479df..517487e945ec 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 = 481713151801982998L;
+    private static final long serialVersionUID = 481712849617457018L;
 
     /** @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 ee575e088af9..6098722b2487 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 = -4426883033076098739L;
+    private static final long serialVersionUID = -4426891118837572703L;
 
     /** @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 f8dcfd4ca7e5..ec8ffea48775 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 = 850540038459145768L;
+    private static final long serialVersionUID = 850542834632706866L;
 
     /** @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 b30a8fc955d7..f075e6225033 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 = -4328908091387489997L;
+    private static final long serialVersionUID = -4328900049460046303L;
 
     /** @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 1ac3599acc14..1a4e4efb3d4a 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 = -5081806545588712469L;
+    private static final long serialVersionUID = -5081814504820543818L;
 
     /** @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 6de838ace18b..7ace137fcbc7 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 = 643086441419608255L;
+    private static final long serialVersionUID = 643086222178393683L;
 
     /** @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 d2f1add86596..925c3c1ebe86 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 = -2438000863531107903L;
+    private static final long serialVersionUID = -2438001057403245459L;
 
     /** @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 e53cafa9604a..1dd4eea40e1d 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 = 4511884797682803218L;
+    private static final long serialVersionUID = -1297932974732248477L;
 
     /** @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 0f3253240981..60f471f5796d 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 = -8813709564858039152L;
+    private static final long serialVersionUID = -8813707515311440852L;
 
     /** @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 bb37527a29bc..968465ba5a73 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 = 3651532830873825556L;
+    private static final long serialVersionUID = 3651532549342929195L;
 
     /** @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 46e947307609..82c0266c3106 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 = 8804372325073820977L;
+    private static final long serialVersionUID = 8804372456960005518L;
 
     /** @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 868c2a31e544..084ce88db664 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 = -4989067242346155993L;
+    private static final long serialVersionUID = -4989067765458172290L;
 
     /** @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 732bca932e98..1a1c3d0c546b 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 = -5353754383989107129L;
+    private static final long serialVersionUID = -5353754577870353096L;
 
     /** @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 40ff95ab53cc..506a8e259d39 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 = -6522141976997593545L;
+    private static final long serialVersionUID = -6522141592144739173L;
 
     /** @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 cd93ef91c086..979da9133178 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 = 7620283297413883892L;
+    private static final long serialVersionUID = 7620283429300301336L;
 
     /** @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 22eae4cbd9ff..87011bd957e1 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 = -2369564662918659841L;
+    private static final long serialVersionUID = 7819910205359311974L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java
index 8d2e80a5ada2..b83e8770a872 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 = -6451433029244638422L;
+    private static final long serialVersionUID = 6581986308188209113L;
 
     /** @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 791a877f8756..35df39e50b92 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 = 5743517656776095147L;
+    private static final long serialVersionUID = 125835815334455047L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java
index c04dd6b4cddc..d874dd69c8df 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 = 4995620074884625748L;
+    private static final long serialVersionUID = 4995620361589413369L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java
index e2e42b07dc03..4a271bbeeab7 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 = 714917015900246106L;
+    private static final long serialVersionUID = -7270009377389410724L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/MyClass.java b/slice2java/cpp/test/Ice/stream/Test/MyClass.java
index 3b16e0a862b8..c604d010f70a 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 = 9172154426505324255L;
+    private static final long serialVersionUID = 7694441791364198168L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/stream/Test/MyException.java b/slice2java/cpp/test/Ice/stream/Test/MyException.java
index 2b1e285f476f..6939c0b764a9 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 = 5734227934089533231L;
+    private static final long serialVersionUID = 5734226898340330970L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java
index 59ed49b84fe0..435c2d71c0f3 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 = 1414042329497310265L;
+    private static final long serialVersionUID = -6848961208496744075L;
 
     /** @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 57c91ea09e73..c6d74efd9ede 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 = -1404705307548823508L;
+    private static final long serialVersionUID = -1404699973938321142L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java
index e6181bec2104..ca73d19ce36e 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 = 8451688740905667590L;
+    private static final long serialVersionUID = -3187684712885024962L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java
index 5e42ccb2c493..fc0644c637a3 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 = -8562132107217971682L;
+    private static final long serialVersionUID = -8562125456001112968L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java
index 29577afb5ca7..544d786b42c9 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 = -1272517100731714331L;
+    private static final long serialVersionUID = 1337003539055679992L;
 }
diff --git a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java
index 2f6f03fb75fb..fad5fdf9abb5 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 = -2065998318838234401L;
+    private static final long serialVersionUID = -1595154200032031966L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java
index 0cc95f544aa6..5ac5fb1ecfcf 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 = -4726936054217986481L;
+    private static final long serialVersionUID = 2217715098896302699L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java
index 63e4e999f6b5..61318030d956 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 = -6428908726967222277L;
+    private static final long serialVersionUID = 228879307717375647L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java
index c1d85909685b..a245cad28b91 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 = -8046140649906011408L;
+    private static final long serialVersionUID = 8525540212378501417L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index d4ef37cc59c8..33952d5c5ba5 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 = -2303177456418264802L;
+    private static final long serialVersionUID = 1564562389091318973L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java
index 17e33a715dba..e5d78d610c96 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 = -7968814730278219053L;
+    private static final long serialVersionUID = -8839624421297849609L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java
index 156b0a7255c5..d2343ff4b832 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 = 8767387677577982076L;
+    private static final long serialVersionUID = -5414169925177154887L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java
index 601145220a5d..2c75ce24ac72 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 = 582616669083118411L;
+    private static final long serialVersionUID = 3563589813351680142L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index a818c06fc7fd..cdf73ea86ad5 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 = -8113899620392469868L;
+    private static final long serialVersionUID = -3158582969454093747L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index f42d609d654c..fbf931471709 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 = 7928936353040449966L;
+    private static final long serialVersionUID = -5059242545349723315L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java
index d03c971c6fdd..13af61aa9bf2 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 = -780806196018542589L;
+    private static final long serialVersionUID = -7273343835252219865L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java
index 90617b56dab9..f68c372b0121 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 = 5127390127821877498L;
+    private static final long serialVersionUID = 5127388699352185539L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java
index 7e6af4c66cbe..59707f114041 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 = -7135054330076768447L;
+    private static final long serialVersionUID = -7135061087308139742L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java
index a7c588226691..eddd10ced59e 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 = 3335999596904314771L;
+    private static final long serialVersionUID = -8278298919012332910L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java
index eb8540998cef..a2957cd0108e 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 = -8834613817397607304L;
+    private static final long serialVersionUID = 483286639079240743L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java
index 6c9d11b40159..25823498894c 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 = 476739478392511790L;
+    private static final long serialVersionUID = -7104789061982614001L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java
index 8033ce38dadf..ab4a85e85b03 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 = 1848270374808177513L;
+    private static final long serialVersionUID = 3354632457798829832L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java
index 7d8577b46c08..7d606e721e07 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 = -6372854088743898333L;
+    private static final long serialVersionUID = 1485958190897116249L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java
index 747e6ab16b3f..7c89b9b05d21 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 = 7113525838390523939L;
+    private static final long serialVersionUID = 8328644458526623175L;
 }
diff --git a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java
index 11c091e26419..a388ae73a76f 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 = -7882078911988430588L;
+    private static final long serialVersionUID = 1280689073716809379L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/A.java b/slice2java/csharp/test/Ice/exceptions/Test/A.java
index 6c6343c0757c..1edafad45602 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 = 7823746574796869923L;
+    private static final long serialVersionUID = 7823746506413875822L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/B.java b/slice2java/csharp/test/Ice/exceptions/Test/B.java
index 125a43e02f89..8deafed35566 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 = -3861409323719745437L;
+    private static final long serialVersionUID = -3861409392098000466L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/C.java b/slice2java/csharp/test/Ice/exceptions/Test/C.java
index 7e35b1b4ab8a..f7bafe90c079 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 = 1080700265999655203L;
+    private static final long serialVersionUID = 1080700197616661102L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/D.java b/slice2java/csharp/test/Ice/exceptions/Test/D.java
index c9535196823d..b8e61298f553 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 = 4780382944382332771L;
+    private static final long serialVersionUID = 4780382876004077742L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Color.java b/slice2java/csharp/test/Ice/hash/Test/Color.java
index eab88faa8805..5b7c04561c1e 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 = -3351237198000967946L;
+    private static final long serialVersionUID = -6535615859712782218L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java
index 7911181f3f44..8ed7fb2d1407 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 = -2820063027559396004L;
+    private static final long serialVersionUID = -2820072878763354711L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Draw.java b/slice2java/csharp/test/Ice/hash/Test/Draw.java
index 339df946d31b..f0076a9d5e6e 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 = -3377005038751305951L;
+    private static final long serialVersionUID = -4147698152996855820L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java
index 672687712478..5bd21e56f0fb 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 = -1224575823279763825L;
+    private static final long serialVersionUID = -1224574598979698566L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java
index 0baf5581b676..6bb660942164 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 = -8727125958105168643L;
+    private static final long serialVersionUID = -8727124607241242680L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/OtherException.java b/slice2java/csharp/test/Ice/hash/Test/OtherException.java
index 39d3a36854df..11462b52d880 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 = -7498237723487467215L;
+    private static final long serialVersionUID = -5149794639075530703L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Pen.java b/slice2java/csharp/test/Ice/hash/Test/Pen.java
index 093892559054..6248861af47f 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 = 7006273920015508413L;
+    private static final long serialVersionUID = -5883635752647814307L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/hash/Test/Point.java b/slice2java/csharp/test/Ice/hash/Test/Point.java
index fe28661dd292..d5e940719102 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 = -2324845060639468944L;
+    private static final long serialVersionUID = -4577018713935066224L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/PointD.java b/slice2java/csharp/test/Ice/hash/Test/PointD.java
index 7bb31d6296f3..e319996f61da 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 = 4625054755705910258L;
+    private static final long serialVersionUID = -3028964004507066137L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/PointF.java b/slice2java/csharp/test/Ice/hash/Test/PointF.java
index cfc6afec6d3e..a8a25015e37a 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 = 5413833033483745565L;
+    private static final long serialVersionUID = -1012288277514487288L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Polyline.java b/slice2java/csharp/test/Ice/hash/Test/Polyline.java
index 89a0a52a7f21..7f28deaf3b7e 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 = -345039358260645352L;
+    private static final long serialVersionUID = -345030119096745683L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java
index 8d9aff9e0cf7..6aa8c0336896 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 = 2568822366940142336L;
+    private static final long serialVersionUID = 2568813383494102877L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java
index d8d210695d74..582c3f0efa2c 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 = -6709848521010461818L;
+    private static final long serialVersionUID = -6709842675820932950L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java
index cd539b3cb6fa..0ce5d3d30184 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 = 244434257317841775L;
+    private static final long serialVersionUID = 244433696802897202L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java
index cec3a650f54a..2ef3093ab2fc 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 = -1207062379860601703L;
+    private static final long serialVersionUID = -1207062769894168715L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
index 393a1569bc84..019360b92771 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 = 7599605320466013848L;
+    private static final long serialVersionUID = 7599594975640708805L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java
index 4ebb48cee2f1..f17e58973a44 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 = 9211532645827273212L;
+    private static final long serialVersionUID = 9211539987734291878L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java
index c4853ac6b7a9..59b1c72bba7f 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 = 770568162007391524L;
+    private static final long serialVersionUID = 770571730404444425L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java
index b65b57d794c8..ad7905751171 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 = -4823063708829402381L;
+    private static final long serialVersionUID = -4823069767170173271L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java
index dac6a52d93ec..5e42ca94ce67 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 = 2279074986899623992L;
+    private static final long serialVersionUID = 2279090428908772629L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/A.java b/slice2java/csharp/test/Ice/objects/Test/A.java
index 3c2fb374bbfa..a1b5f7f3ff0a 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 = -522005888255801451L;
+    private static final long serialVersionUID = 2447529718601900199L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/A1.java b/slice2java/csharp/test/Ice/objects/Test/A1.java
index 29831fbe246f..6d9da114a537 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 = -5926745983582563411L;
+    private static final long serialVersionUID = -5926743456258052503L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/B.java b/slice2java/csharp/test/Ice/objects/Test/B.java
index 126ca7427ab2..325fd9604433 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 = -8890918475953209815L;
+    private static final long serialVersionUID = -8890910328008533927L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/B1.java b/slice2java/csharp/test/Ice/objects/Test/B1.java
index ed82d7bf4f56..90b6b486f24c 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 = 601519982968278404L;
+    private static final long serialVersionUID = -5615130816473894140L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Base.java b/slice2java/csharp/test/Ice/objects/Test/Base.java
index e532971db4ba..224cc493be67 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 = -5062923773491644612L;
+    private static final long serialVersionUID = -3160529699082873986L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/C.java b/slice2java/csharp/test/Ice/objects/Test/C.java
index 686768ad1406..326844fbd686 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 = 1623490681842409919L;
+    private static final long serialVersionUID = 6016381635199607053L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/COneMember.java b/slice2java/csharp/test/Ice/objects/Test/COneMember.java
index 50e4117e6a7f..346604515e3a 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 = 3050977166488229504L;
+    private static final long serialVersionUID = 3050969018549785264L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java
index bf58928834ae..80b4c6a2dfc1 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 = -6347608722054276069L;
+    private static final long serialVersionUID = -2478774203724707429L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/D.java b/slice2java/csharp/test/Ice/objects/Test/D.java
index ca3a53765c55..1c9e44a1e690 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 = -2790294530626579656L;
+    private static final long serialVersionUID = 6535207429449343802L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/D1.java b/slice2java/csharp/test/Ice/objects/Test/D1.java
index 70768ff029f3..280d020fda05 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 = 8825850938527935171L;
+    private static final long serialVersionUID = -4133762748464309053L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/E.java b/slice2java/csharp/test/Ice/objects/Test/E.java
index 342ff6bb3e33..9aa7a24c54ae 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 = -5739188061538600028L;
+    private static final long serialVersionUID = 2878101521646624672L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/EBase.java b/slice2java/csharp/test/Ice/objects/Test/EBase.java
index 1722787f9624..4a753e094150 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 = 1027059820942237774L;
+    private static final long serialVersionUID = -4423190674905892146L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/EDerived.java b/slice2java/csharp/test/Ice/objects/Test/EDerived.java
index 0acb24bda5a2..6d6e939349ca 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 = -3597619475924577710L;
+    private static final long serialVersionUID = 8632468663466165330L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java
index 8b8e1aeea302..f1c31da3943a 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 = -6225292183417946225L;
+    private static final long serialVersionUID = -6225284200933730689L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java
index 132e1f00d5d9..25ef4d0a0b26 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 = 7164114726447791124L;
+    private static final long serialVersionUID = 6067485655127525908L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/F.java b/slice2java/csharp/test/Ice/objects/Test/F.java
index a08a1491df04..7cdc20253f20 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 = 4880308553823955985L;
+    private static final long serialVersionUID = 2427530560815119441L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/F1.java b/slice2java/csharp/test/Ice/objects/Test/F1.java
index 8280fc3d3cfb..02b256c79775 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 = 6192375397572110139L;
+    private static final long serialVersionUID = 6192372022888844329L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/F3.java b/slice2java/csharp/test/Ice/objects/Test/F3.java
index 24b88eca8603..a64f7d360d8d 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 = -6154793382952309311L;
+    private static final long serialVersionUID = -5008477432660034109L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/IBase.java b/slice2java/csharp/test/Ice/objects/Test/IBase.java
index e3cdc841ce14..0bc3dba84509 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 = 4060269648216532203L;
+    private static final long serialVersionUID = 4060267040664537519L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/IDerived.java b/slice2java/csharp/test/Ice/objects/Test/IDerived.java
index 7254af60852d..bc7ff047353b 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 = 7299534610211060467L;
+    private static final long serialVersionUID = 7299532002659065783L;
 
     /** @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 62f97349f3ae..ac8ff99184f2 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 = -1425260937378890173L;
+    private static final long serialVersionUID = -1425258410206546445L;
 
     /** @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 7067100c39f7..36c21dbb42a8 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 = -2337229180273401836L;
+    private static final long serialVersionUID = -2337226572721407152L;
 }
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 bd1c1155156d..fa521e629e94 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 = -1298679491796886780L;
+    private static final long serialVersionUID = -1298687389277694947L;
 
     /** @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 591b44079162..6039f0955f93 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 = 1842238294486715056L;
+    private static final long serialVersionUID = 1842230146541666036L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/K.java b/slice2java/csharp/test/Ice/objects/Test/K.java
index efb0036c8704..d882d2776249 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 = 4645161769264969316L;
+    private static final long serialVersionUID = 4645159241869358806L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/L.java b/slice2java/csharp/test/Ice/objects/Test/L.java
index 01833165e9b6..4d900a658a5c 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 = 6629739431473347878L;
+    private static final long serialVersionUID = 6629747328726485090L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/M.java b/slice2java/csharp/test/Ice/objects/Test/M.java
index 8d31fb7e4ff6..619cc4f961d6 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 = -8088097428027077371L;
+    private static final long serialVersionUID = -8088105490654380657L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Recursive.java b/slice2java/csharp/test/Ice/objects/Test/Recursive.java
index eaa226c033e6..a60ce6a6e7c5 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 = 3617877854363089721L;
+    private static final long serialVersionUID = 3617885916990559113L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/S.java b/slice2java/csharp/test/Ice/objects/Test/S.java
index 18699f270029..1a3174c89799 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 = 481771876023459605L;
+    private static final long serialVersionUID = 481774568807668433L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/S1.java b/slice2java/csharp/test/Ice/objects/Test/S1.java
index 16a694481846..fa7cecf0ec2c 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 = 7211340024962747603L;
+    private static final long serialVersionUID = 7211342467048209555L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/SC1.java b/slice2java/csharp/test/Ice/objects/Test/SC1.java
index ae35aacb74b2..02fa51cee852 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 = 186202562071998527L;
+    private static final long serialVersionUID = 186210544557349883L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java
index 727246d747c8..9a1be7ba9d73 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 = 6227753197330513689L;
+    private static final long serialVersionUID = 6227745134616100713L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java
index a9c72509f218..afddfd45701d 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 = 4658847085139081346L;
+    private static final long serialVersionUID = 2682798730355010946L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/StructKey.java b/slice2java/csharp/test/Ice/objects/Test/StructKey.java
index 3632bc400c3a..e23fa38733af 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 = -149516377390211608L;
+    private static final long serialVersionUID = -4125748400968591380L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java
index 57756ee5706e..afd081592609 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 = 2723847610493716277L;
+    private static final long serialVersionUID = 2723847671121257300L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java
index 279dedbf1d41..71e6117019b3 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 = -1085762217528276716L;
+    private static final long serialVersionUID = 1783475983328933742L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java
index 0e7cab9cfa19..9f57854aedf1 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 = -1948060407629336195L;
+    private static final long serialVersionUID = 3424417535150201661L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java
index 6da941b7456c..3b385932c823 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 = -2071770764207106627L;
+    private static final long serialVersionUID = 8350541067705898535L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/Structure.java b/slice2java/csharp/test/Ice/operations/Test/Structure.java
index 0c5b678065e0..59f26bbadf06 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 = -3165519426279319714L;
+    private static final long serialVersionUID = -1343042837982321793L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/A.java b/slice2java/csharp/test/Ice/optional/Test/A.java
index d8b964597071..a6a740aa4faf 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 = 6418398794285941264L;
+    private static final long serialVersionUID = -5510462145449746800L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/B.java b/slice2java/csharp/test/Ice/optional/Test/B.java
index dff69eb12772..f10ec46009c2 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 = 4952157948609075683L;
+    private static final long serialVersionUID = -7377390800351426077L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/C.java b/slice2java/csharp/test/Ice/optional/Test/C.java
index cddf4d58625f..30409ce1544b 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 = -2600628347788881283L;
+    private static final long serialVersionUID = 5621886725339884605L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java
index cd50e05ff059..fb441045087b 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 = 2317253451971197943L;
+    private static final long serialVersionUID = -4219412907374830926L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/E.java b/slice2java/csharp/test/Ice/optional/Test/E.java
index b926603cc2d7..2ea491807c9b 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 = -1850739165833726674L;
+    private static final long serialVersionUID = -1850742821843471438L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/F.java b/slice2java/csharp/test/Ice/optional/Test/F.java
index 71effc8e49dd..3d30da35ebff 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 = -6430492799044299043L;
+    private static final long serialVersionUID = -6430489468333114815L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java
index a21f50d12251..46621616e709 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 = 1569601491535833962L;
+    private static final long serialVersionUID = 1569604744650757841L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/G.java b/slice2java/csharp/test/Ice/optional/Test/G.java
index a6ce709815b9..9d5515c8351c 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 = 4931378569439062355L;
+    private static final long serialVersionUID = 5298483872035855635L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/G1.java b/slice2java/csharp/test/Ice/optional/Test/G1.java
index 103236651898..90d0a4b5c579 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 = 7339784651036811897L;
+    private static final long serialVersionUID = 7339781243140209276L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/G2.java b/slice2java/csharp/test/Ice/optional/Test/G2.java
index a0a980fad9ed..3cd72f0772ab 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 = 3824551447516793007L;
+    private static final long serialVersionUID = 3824547791490393854L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java
index ae0667d127db..eada37f3557d 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 = 4968902846081684076L;
+    private static final long serialVersionUID = -7634680378206633952L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java
index 39f55af3eb21..82956119f7ad 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 = -7219599250993743228L;
+    private static final long serialVersionUID = -7219601303196444929L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java
index e8c2f8f30a06..4ea747e943f5 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 = -7589926134534901992L;
+    private static final long serialVersionUID = 7904463135427303774L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java
index ba2fff0d76a1..174e4aeece94 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 = 6974820262938500859L;
+    private static final long serialVersionUID = 2811744946403413179L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java
index 4606a501f29c..aa3452013b37 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 = 2894238671914095088L;
+    private static final long serialVersionUID = 2894235186370574837L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java
index fc0c6e31ea91..3ad6914b686d 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 = 6700987939684253131L;
+    private static final long serialVersionUID = 6700991270550181582L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java
index 905ea0e487d8..07128545f7dd 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 = -1912284216547349519L;
+    private static final long serialVersionUID = -1912287624443952140L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/WD.java b/slice2java/csharp/test/Ice/optional/Test/WD.java
index 12e53aea6345..41ae6e0402dc 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 = 3925651668881477309L;
+    private static final long serialVersionUID = -8302722454936193373L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C.java b/slice2java/csharp/test/Ice/scope/Test/C.java
index 8a596754a1fb..58654bf8bd1c 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 = -5190245518800879524L;
+    private static final long serialVersionUID = -5190251437671700241L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C1.java b/slice2java/csharp/test/Ice/scope/Test/C1.java
index 7f19f50e86f4..17e0b12535e0 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 = 8893237723567700893L;
+    private static final long serialVersionUID = 8893231724620594887L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C2.java b/slice2java/csharp/test/Ice/scope/Test/C2.java
index d34e9b57e7c2..c9d347b7487f 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 = 3490900637470434858L;
+    private static final long serialVersionUID = -7753638517930905976L;
 
     /** @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 d3827d73cc84..8254467e99c1 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 = 4615623813782904386L;
+    private static final long serialVersionUID = 4615629812729966257L;
 
     /** @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 06c9eb264a84..26511a54a22a 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 = 672590504364672539L;
+    private static final long serialVersionUID = 672584911097314400L;
 
     /** @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 734ef733305c..706e810f0e76 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 = 8654434911139727606L;
+    private static final long serialVersionUID = 8654440744624109295L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java
index acba4aba7b98..171b5aa99c11 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 = 3694617740031832762L;
+    private static final long serialVersionUID = 3694611981304604451L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S.java b/slice2java/csharp/test/Ice/scope/Test/S.java
index 208d908d4efc..9810da3e23e6 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 = 2159703709839384196L;
+    private static final long serialVersionUID = 2159709548646896157L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S1.java b/slice2java/csharp/test/Ice/scope/Test/S1.java
index cb69ae1b54da..75579a5cb3f2 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 = 1241681287065315620L;
+    private static final long serialVersionUID = 1241676215548712830L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S2.java b/slice2java/csharp/test/Ice/scope/Test/S2.java
index ab18f2d04fed..9d90c02d0c8b 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 = 4620651533032635987L;
+    private static final long serialVersionUID = -4202216271979037839L;
 }
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java
index c90c1d8a5ec3..834a83fc3ba6 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 = 2039936907644937345L;
+    private static final long serialVersionUID = 2039942806984600917L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java
index 06cf2ff1c072..7c2150abfab9 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 = -3369456566551161058L;
+    private static final long serialVersionUID = -3369457330900526842L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/S.java b/slice2java/csharp/test/Ice/seqMapping/Test/S.java
index 1f542c4edf7c..646b0c17b068 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 = -691296351321921871L;
+    private static final long serialVersionUID = -691305135822218327L;
 }
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java
index be7378440e9d..ef45394bbe00 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 = 9219736666168627221L;
+    private static final long serialVersionUID = 9219744257481611405L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java
index 8424cff41bff..692040ce78ac 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 = -477023839483496252L;
+    private static final long serialVersionUID = -477016946841558025L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java
index db7878c85e16..1c62fca7db61 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 = 3485214546270625634L;
+    private static final long serialVersionUID = 3485210213302343953L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index f15050e40d20..4ff51cdfd2cd 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 = 1717378117571498003L;
+    private static final long serialVersionUID = 1717371225062818656L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index abaa7b60849f..662a61e0c134 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 = -7384918273772659894L;
+    private static final long serialVersionUID = -7384917151405582215L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index 29b24bcb4e83..70da46d13f56 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 = 3424370157733741717L;
+    private static final long serialVersionUID = 3424372145229753741L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 438cf27c5ce7..cff1cafd9809 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 = -1172598620532482236L;
+    private static final long serialVersionUID = -1172606058013275172L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 45ae9d8aae7a..51c272fdf645 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 = -1126113779022712003L;
+    private static final long serialVersionUID = -1126117417019005147L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index 2992d487bad5..17c4aecad4a7 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 = -2097583579664977251L;
+    private static final long serialVersionUID = -2097581592187938939L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java
index 583832915d9d..c25b17a74cd1 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 = 1964156258418977456L;
+    private static final long serialVersionUID = 7266210612118601381L;
 
     /** @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 61214eab581b..d220ff1d6566 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 = -7588900385649647876L;
+    private static final long serialVersionUID = 3163146509762733161L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 4afd478fae70..f63d3578a6de 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 = -6397001136673021371L;
+    private static final long serialVersionUID = -6397001148199310044L;
 
     /** @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 c5fc0ca43043..801c2f72fce1 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 = -9066879799055338873L;
+    private static final long serialVersionUID = -9066888063015380740L;
 
     /** @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 dc5990a0a262..9a123a4959d7 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 = -8121718647868285229L;
+    private static final long serialVersionUID = -5803138971495296474L;
 
     /** @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 aec8610499fc..b61a780e6c3f 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 = -1227738936037355615L;
+    private static final long serialVersionUID = 968308787330427402L;
 
     /** @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 481c8975eca1..94f56ac7272c 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 = 5318651704937954801L;
+    private static final long serialVersionUID = 3573149745199233635L;
 
     /** @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 cc3113499baf..43d303c5d441 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 = -5414107767109526669L;
+    private static final long serialVersionUID = -4541493670650869005L;
 
     /** @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 ce0c98802d68..9cf99ced1688 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 = 6521188950665763623L;
+    private static final long serialVersionUID = 8672206085797878485L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java
index a1f2546554fd..e3e06e8dc960 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 = -7655918830779659372L;
+    private static final long serialVersionUID = -7655927097212482399L;
 
     /** @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 9071ba7ffc4e..cf2efbc63a59 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 = -2271133029229317727L;
+    private static final long serialVersionUID = -2271124762706709788L;
 
     /** @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 d05e717849ff..313fc8a809e2 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 = 4147527872908323618L;
+    private static final long serialVersionUID = 4147528175129490415L;
 
     /** @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 021dc23d50b7..cf9d763b9402 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 = 481704725056321918L;
+    private static final long serialVersionUID = 481712991659676050L;
 
     /** @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 153c578f196d..0110c2b5feb5 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 = -4426880708499773691L;
+    private static final long serialVersionUID = -4426880720026062108L;
 
     /** @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 bff3ecf42497..374e77d7149e 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 = 850537734541108632L;
+    private static final long serialVersionUID = 850537725422453685L;
 
     /** @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 7825e7f3b28a..3549c0c97e0a 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 = -4328906262671619058L;
+    private static final long serialVersionUID = -4328906276799964653L;
 
     /** @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 d5d69eb456f4..e171c27ab96c 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 = -5081802919141869868L;
+    private static final long serialVersionUID = -5081802907596894595L;
 
     /** @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 2aae045281af..ae7050775663 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 = 643078017336306816L;
+    private static final long serialVersionUID = 643086281277301307L;
 
     /** @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 83eb68be2b9c..ddcb4ad0e1fd 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 = -2438003667384145247L;
+    private static final long serialVersionUID = -2438001023673144763L;
 
     /** @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 25f415ffae4e..7aab3a891d22 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 = 3754411281552409548L;
+    private static final long serialVersionUID = 7949965597091399024L;
 
     /** @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 8c49c08f8a72..b35105a972a2 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 = -8813709066347270866L;
+    private static final long serialVersionUID = -8813708884177372796L;
 
     /** @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 a390482a1468..3a492ea79687 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 = 4410692041359601424L;
+    private static final long serialVersionUID = 4410691902027671829L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java
index 5a58fd8f65fe..d191ae2aae89 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 = 3651524407929699039L;
+    private static final long serialVersionUID = 3651532670722597520L;
 
     /** @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 8ee2a5c9ea57..01462437536e 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 = 8804375132741993978L;
+    private static final long serialVersionUID = 8804372485225049013L;
 
     /** @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 be76c1835094..22641013be6a 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 = -4989060920688664009L;
+    private static final long serialVersionUID = -4989061106505947540L;
 
     /** @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 0cf0b3c0a83c..5d53ab95422f 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 = -5353757191640673908L;
+    private static final long serialVersionUID = -5353754544140335165L;
 
     /** @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 2c10de6a7f25..a602d30d8656 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 = -6522133552818497791L;
+    private static final long serialVersionUID = -6522141816846356813L;
 
     /** @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 ad7eea6af950..70119ef8039e 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 = 7620286103859048962L;
+    private static final long serialVersionUID = 7620283457565120624L;
 
     /** @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 d7722b128fe2..3208b16c0860 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 = 7634249286300929577L;
+    private static final long serialVersionUID = -6951604267503975937L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java
index c3114333ee8b..61af47e6599f 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 = 2514033725554376685L;
+    private static final long serialVersionUID = -6791786840020669345L;
 
     /** @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 b177c92a2e26..d3687ae8854b 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 = 3093780981504142686L;
+    private static final long serialVersionUID = 1094507224535185275L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java
index e2744e8f158d..44bfae3835fa 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 = 4809514640114277871L;
+    private static final long serialVersionUID = -7085092646089761387L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/MyClass.java b/slice2java/csharp/test/Ice/stream/Test/MyClass.java
index 603da6c1ebb3..979b7147c711 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 = 2132136628771776721L;
+    private static final long serialVersionUID = -1239287632244382829L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/stream/Test/MyException.java b/slice2java/csharp/test/Ice/stream/Test/MyException.java
index f1bbd635de5e..27218fdb36f2 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 = 5734225375715494862L;
+    private static final long serialVersionUID = 5734228107130770231L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java
index 18e601807218..dad19a4facba 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 = -1323284426138067613L;
+    private static final long serialVersionUID = -8099835955702247919L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/Clash/Cls.java b/slice2java/csharp/test/Slice/escape/Clash/Cls.java
index d7bd8a449cfb..e1d1d8c946dc 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 = 2828537391936203186L;
+    private static final long serialVersionUID = -4666393784309797851L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/Clash/Ex.java b/slice2java/csharp/test/Slice/escape/Clash/Ex.java
index d53618b638bf..e0a761dbba33 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 = 1374408021877311483L;
+    private static final long serialVersionUID = 3539995043759183734L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/Clash/St.java b/slice2java/csharp/test/Slice/escape/Clash/St.java
index 890750af8e1a..4bcd026ed653 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 = -8928680307454614411L;
+    private static final long serialVersionUID = -5881145096411379267L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java
index 20aae26d3c4b..9fb02fd45192 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 = -8797978529743004565L;
+    private static final long serialVersionUID = 7007500960943198978L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/_break.java b/slice2java/csharp/test/Slice/escape/_abstract/_break.java
index 9371ebc0ff95..9ef45506fe88 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 = 3009636642399294660L;
+    private static final long serialVersionUID = 3009637002792891949L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java
index 902e78d68785..5448995ba718 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 = 3919841846361466899L;
+    private static final long serialVersionUID = -1434045314970136469L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java
index 444abcada571..f97e099c57db 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 = -8293825379733991472L;
+    private static final long serialVersionUID = -8293825058237174215L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java
index 262968c70ee3..4ff46a67561b 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 = 7986279142876462595L;
+    private static final long serialVersionUID = 5847212034412409667L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java
index cc90688975c2..236b87343114 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 = -7549656250077316388L;
+    private static final long serialVersionUID = 5474826520589685712L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/macros/Test/Default.java b/slice2java/csharp/test/Slice/macros/Test/Default.java
index 662a701e27ef..0266f440a1e0 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 = 7350414045191370622L;
+    private static final long serialVersionUID = -3542949904667224834L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java
index 73d2c049a827..5e09fd91f874 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 = -8589872831265816673L;
+    private static final long serialVersionUID = 2878532204252218911L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/structure/Test/C.java b/slice2java/csharp/test/Slice/structure/Test/C.java
index a19add0b0c44..ca79fcfb0f85 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 = -3172274502485483504L;
+    private static final long serialVersionUID = -3172274913172472845L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/structure/Test/S1.java b/slice2java/csharp/test/Slice/structure/Test/S1.java
index d3da9ecab609..08740aa031b0 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 = -5542862269348394334L;
+    private static final long serialVersionUID = -5542861858660784123L;
 }
diff --git a/slice2java/csharp/test/Slice/structure/Test/S2.java b/slice2java/csharp/test/Slice/structure/Test/S2.java
index ea4b4e774a76..a94cee856428 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 = 4412599751759657649L;
+    private static final long serialVersionUID = 2722504844490937280L;
 }
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 8bebd185079d..953160415263 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 = 4086412658890570055L;
+    private static final long serialVersionUID = 2862388406763615132L;
 }
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 160558509699..36fbdf3bda4e 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 = 6434294451450998788L;
+    private static final long serialVersionUID = 6434292197767227869L;
 
     /** @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 33b163dd55c1..96ebb6658b65 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 = 6384635303924288835L;
+    private static final long serialVersionUID = 6384637605322706677L;
 }
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 b6269946ae81..edbfb4930a6d 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 = -2014567980847230246L;
+    private static final long serialVersionUID = -2014564522295524207L;
 }
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 d610f8ae0e9c..dac8caf6b2e1 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 = 5662530784059411676L;
+    private static final long serialVersionUID = -3749983018444078671L;
 
     /** @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 6fe83e569021..4ddcf8f827b9 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 = 9020603997681917288L;
+    private static final long serialVersionUID = -4817664711206060347L;
 }
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 40eb3058a8e3..e671c9e007d8 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 = 5123656795475895739L;
+    private static final long serialVersionUID = -7328171642154281448L;
 
     /** @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 c63a2e7d5a6f..e5ad160605f3 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 = -6678971680779574248L;
+    private static final long serialVersionUID = 3960865032494304001L;
 
     /** @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 0a5f3aac41f3..85d62e32db35 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 = 8186831215908675187L;
+    private static final long serialVersionUID = 7507608105804938888L;
 
     /** @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 50861b1c79f3..b6d317056bca 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 = -5444050634548863164L;
+    private static final long serialVersionUID = 6211400523937962815L;
 }
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 d2edb6dc14c7..5af5a8240ea4 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 = 2812838159648312095L;
+    private static final long serialVersionUID = -970794721452177796L;
 }
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 70c020485013..d07e3f5ed796 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 = 3716336495349102632L;
+    private static final long serialVersionUID = 8043332016034200369L;
 }
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 4ff45e0015d1..07c05828c9c1 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 = 5127392291094405360L;
+    private static final long serialVersionUID = 5127391406459285970L;
 }
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 9a34d6580fdc..eba88fa69988 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 = 4750599809077320271L;
+    private static final long serialVersionUID = 7872909104524374105L;
 }
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 f956d108e6aa..0dd6fa379d8b 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 = 2974756677982029148L;
+    private static final long serialVersionUID = -5289388645355432282L;
 }
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 d2a043241d98..89dbfab52da3 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 = 7134458402821945482L;
+    private static final long serialVersionUID = 3136717911335431225L;
 }
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 6bf40bcbcad5..627e803967ea 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 = 7823738302858514649L;
+    private static final long serialVersionUID = 7823740490859013361L;
 }
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 6c8704174f6a..22c9cd0e959b 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 = -3861417430341001063L;
+    private static final long serialVersionUID = -3861420862965501263L;
 }
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 2887d3345b16..7f63fb1d2e58 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 = 1080691994061299929L;
+    private static final long serialVersionUID = 1080694182061798641L;
 }
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 a54003ec3533..c7185e5faccd 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 = 4780374837761077145L;
+    private static final long serialVersionUID = 4780371405136576945L;
 }
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 6d6fa095b771..baceabe02ad8 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 = 7823739918558430032L;
+    private static final long serialVersionUID = 7823745330972761171L;
 }
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 426ac802c451..3627ab3c4a4f 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 = -3861416145261346288L;
+    private static final long serialVersionUID = -3861410732695356653L;
 }
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 d184808029a6..a4d27b8d2ce6 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 = 1080693609761215312L;
+    private static final long serialVersionUID = 1080699022175546451L;
 }
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 ee8f77600e69..f7db5ba85c2f 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 = 4780376122840731920L;
+    private static final long serialVersionUID = 4780381535406721555L;
 }
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 818226174050..81d561c68196 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 = 2446816343668030710L;
+    private static final long serialVersionUID = 5323959807186812406L;
 }
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 78b6e966e896..be44e07ab2eb 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 = -2820066556947942986L;
+    private static final long serialVersionUID = -2820063404561910877L;
 }
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 e1c5a0bcddd3..91d6d59e1bb1 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 = -3457969890521970173L;
+    private static final long serialVersionUID = -522649076443067029L;
 }
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 116213545792..4157a9af3911 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 = -4450870522722766332L;
+    private static final long serialVersionUID = 7161035613167634468L;
 
     /** @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 a7241c8822e4..84945a8789ab 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 = -5317772063580495792L;
+    private static final long serialVersionUID = -3148911762331286416L;
 }
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 72938406734f..60a5b281099f 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 = 9175496410781720790L;
+    private static final long serialVersionUID = -6815034813990563833L;
 }
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 5850f0a7fe97..9e141f065390 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 = 520095023368135401L;
+    private static final long serialVersionUID = -8491555238195926453L;
 }
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 544c2cc2eff4..e67fcbaf2efa 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 = -345037432606342209L;
+    private static final long serialVersionUID = -345028672600201270L;
 }
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 a7f6b48e0ea9..c6b36adc4989 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 = -2304574862094193849L;
+    private static final long serialVersionUID = 5519606408797767945L;
 
     /** @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 3287293a3e96..36ccdd0bbfa7 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 = -5926739182725798190L;
+    private static final long serialVersionUID = -5926741847093306052L;
 
     /** @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 1fc7173f4936..2e7c69b699c7 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 = -8890911553582022310L;
+    private static final long serialVersionUID = -8890919799628010708L;
 
     /** @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 1d6ca7adcb0e..1b292d2340dc 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 = 2809724675178652676L;
+    private static final long serialVersionUID = -588036680949294204L;
 
     /** @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 ae6a78199a6c..980e644afa60 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 = -851043859143777497L;
+    private static final long serialVersionUID = 6976424417038639710L;
 
     /** @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 ff988220e142..e8ad8757941c 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 = 6289591724693979656L;
+    private static final long serialVersionUID = -2604947867735142383L;
 
     /** @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 9a62a0ebc4e9..3f093711511c 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 = 3050964949358912742L;
+    private static final long serialVersionUID = 3050973029995229966L;
 
     /** @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 0e81b5ccdba7..f46c4e5b8596 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 = -2609408224909715813L;
+    private static final long serialVersionUID = 5826721074295446811L;
 
     /** @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 51ee5be555ed..a70ed6bee8e0 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 = 6389462772204644473L;
+    private static final long serialVersionUID = 6162010964467562433L;
 
     /** @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 92f7d57175ed..1e28cfc7cf5b 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 = 3513632180487888195L;
+    private static final long serialVersionUID = 3486719893646194883L;
 
     /** @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 b8db5da42d9e..08363d05ec86 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 = 7650557011520220170L;
+    private static final long serialVersionUID = -5223611614879631288L;
 
     /** @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 379c60844431..dc9eed8afd86 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 = -1668883310676727346L;
+    private static final long serialVersionUID = -5592004693730582194L;
 }
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 66f4c7f2f963..310f7a3ba691 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 = 9205670495667168722L;
+    private static final long serialVersionUID = -5305213666827923630L;
 }
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 244d49e0eb3c..a2121153e670 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 = -6225279762082834135L;
+    private static final long serialVersionUID = -6225288046919371007L;
 }
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 283bf288fa6b..8ef3685eff3a 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 = 6190057663871075348L;
+    private static final long serialVersionUID = -6601304974119732332L;
 }
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 dd9113ac1208..170baac2cc7a 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 = -5996183876094336303L;
+    private static final long serialVersionUID = 7207937910137284369L;
 
     /** @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 51362cfedeb1..451107277179 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 = 6192373949741419397L;
+    private static final long serialVersionUID = 6192365969843035760L;
 
     /** @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 68786cbe5f23..230fb8b32af0 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 = -5952049879832860412L;
+    private static final long serialVersionUID = -399725929402896320L;
 
     /** @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 421116f34c66..96c42930d7fa 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 = -1425254175467274640L;
+    private static final long serialVersionUID = -1425256800888394810L;
 
     /** @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 2f6644b6d4eb..9d92bccbe42e 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 = -2337225231107460757L;
+    private static final long serialVersionUID = -2337227856596813819L;
 }
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 93648ee99384..eeafce1b52bd 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 = -1298689100344681387L;
+    private static final long serialVersionUID = -1298680815555661504L;
 
     /** @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 aaddcb675dac..825643984296 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 = 1842226038464792719L;
+    private static final long serialVersionUID = 1842234157997597089L;
 }
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 e0751ecd77dd..cb3bf0dabed3 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 = 4645160263335012982L;
+    private static final long serialVersionUID = 4645163093015791184L;
 
     /** @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 03b9ce862595..dc11d4fbc93a 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 = 6629743579844424473L;
+    private static final long serialVersionUID = 6629735294984541495L;
 
     /** @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 72bdddaa6efd..8746fad65191 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 = -8088101372244910387L;
+    private static final long serialVersionUID = -8088093291607501410L;
 
     /** @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 da36340c0c89..a03a6accbb84 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 = 3617887258751014696L;
+    private static final long serialVersionUID = 3617879178122717389L;
 
     /** @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 d75e96197da9..b70cc134e60a 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 = 481773343149175338L;
+    private static final long serialVersionUID = 481770552347256964L;
 }
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 b138f6e8af0a..f0325614c42d 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 = 6227749214281023167L;
+    private static final long serialVersionUID = 6227757333809709079L;
 }
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 2dbf1c61b63c..dd82052cff37 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 = -2896416649208958078L;
+    private static final long serialVersionUID = -8868945515569534206L;
 }
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 3c5e6697d9e6..dd12987fec69 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 = 6996463745980203590L;
+    private static final long serialVersionUID = 8969344507264366724L;
 }
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 7797ff8f462c..72e7b43e5bef 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 = 2723841514764730534L;
+    private static final long serialVersionUID = 2723850483944151578L;
 }
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 ccdd492a718e..42232d4174d7 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 = 8757744938043841332L;
+    private static final long serialVersionUID = 4209432344147644251L;
 
     /** @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 3aa0ebcf7207..5a9ea8b1e680 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 = -1395430870315846499L;
+    private static final long serialVersionUID = -7265322524333228771L;
 }
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 56b8375bb77b..809acdb460e7 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 = 3421783326116027773L;
+    private static final long serialVersionUID = -8351471351381757710L;
 }
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 1c44fe4a081c..3cb26a3969e3 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 = -8888516362014852733L;
+    private static final long serialVersionUID = 814159887162282646L;
 }
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 2828179dc983..21a0e4e7c41b 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 = 2723841358411769173L;
+    private static final long serialVersionUID = 2723850942471716406L;
 }
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 0793dc524f49..b67cfd1e9cfd 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 = -5329718089561322457L;
+    private static final long serialVersionUID = 3499396423360736233L;
 
     /** @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 ff54d1ed33f8..2c6510dd6bde 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 = -7058587997579229923L;
+    private static final long serialVersionUID = 1729452291349885533L;
 }
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 de9bd00f3e40..134f923c35b4 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 = -182233496165316754L;
+    private static final long serialVersionUID = -2654453909565788800L;
 }
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 4956d3cb55e5..15932029de2c 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 = -7513122971072631740L;
+    private static final long serialVersionUID = 4262555737874386377L;
 }
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 5597650e2a4c..98e240fdf025 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 = -2007878491546581488L;
+    private static final long serialVersionUID = 2957275600780605456L;
 
     /** @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 18f4192e0334..0c5b3472995f 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 = 4662025794690450467L;
+    private static final long serialVersionUID = 8954143012621632739L;
 
     /** @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 2a9fe42a8cdd..81f58aabb90b 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 = 3123686696205187453L;
+    private static final long serialVersionUID = 6108551524031614205L;
 
     /** @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 74b665b688cf..7f6aeb9e1592 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 = -2769302612598748728L;
+    private static final long serialVersionUID = 824508237759837371L;
 }
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 279614f9b895..0ecccf735cf6 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 = -1850742824421877008L;
+    private static final long serialVersionUID = -1850739303893958081L;
 
     /** @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 f5e0d5df3e22..f750692e5529 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 = -6430489476068044541L;
+    private static final long serialVersionUID = -6430492981277607092L;
 
     /** @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 f356e1aeefc3..bcec128d7896 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 = 1569604742076448836L;
+    private static final long serialVersionUID = 1569601314511081799L;
 }
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 4988691748c3..d27bb7d60edd 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 = 1265844901571365971L;
+    private static final long serialVersionUID = -645399745493099245L;
 
     /** @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 afc32bb9538d..b20672b7f7dd 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 = 7339781235401040582L;
+    private static final long serialVersionUID = 7339784673118652597L;
 }
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 a88070e536ee..46f8181f5a34 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 = 3824547788907763786L;
+    private static final long serialVersionUID = 3824551309447353648L;
 }
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 c955e312dce6..1bf90461464a 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 = -738338136970341718L;
+    private static final long serialVersionUID = -6287610078277688941L;
 
     /** @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 8d38d5f471a6..8cd964601281 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 = -7219601300618681750L;
+    private static final long serialVersionUID = -7219599112862636823L;
 
     /** @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 1ffcb10294bb..6f8f02b508df 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 = 6861733884025755095L;
+    private static final long serialVersionUID = -8541663083195172335L;
 }
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 5d2c842eab7c..7121ecdf23b2 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 = 5412875199788471483L;
+    private static final long serialVersionUID = 6383501056270277243L;
 
     /** @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 d7d79b5a3eed..5b1750755736 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 = 2894235178631348495L;
+    private static final long serialVersionUID = 2894238694014909500L;
 }
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 401dfd694363..660cd7ae4b9c 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 = 6700991267967364476L;
+    private static final long serialVersionUID = 6700987762763724287L;
 }
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 aea06c14983c..78c3d29158bc 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 = -1912287632183104434L;
+    private static final long serialVersionUID = -1912284194446535107L;
 }
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 0348657c9a8d..eb65c57d89a9 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 = -3500733738358300500L;
+    private static final long serialVersionUID = -6126915044784780356L;
 
     /** @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 7d44621aff66..eec55c866845 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 = -7827062897512371184L;
+    private static final long serialVersionUID = -79640849095006448L;
 
     /** @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 aaed3a46b0d5..af208c1feccc 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 = 2359241415116726499L;
+    private static final long serialVersionUID = -279478286743458717L;
 
     /** @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 acf3a802eced..2ea58435dd60 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 = -1880990808266272643L;
+    private static final long serialVersionUID = 1008627605350007357L;
 
     /** @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 6c1faeba6d46..b07e39d29a66 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 = 6154244555941271119L;
+    private static final long serialVersionUID = 139520448569608416L;
 }
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 622393ae9bcd..d474e00758cd 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 = -1850735984956836927L;
+    private static final long serialVersionUID = -1850744082371479264L;
 
     /** @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 7d4f7ebc8bc2..9e6ac1bcf389 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 = -6430495979912275406L;
+    private static final long serialVersionUID = -6430498792823635117L;
 
     /** @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 cb809cf30d40..2b6dcf263eab 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 = 1569611780737538003L;
+    private static final long serialVersionUID = 1569603683234874623L;
 }
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 4fc4739624c3..0e007d631047 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 = -5727102055443756525L;
+    private static final long serialVersionUID = -9038935085456528429L;
 
     /** @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 1f044b76a88b..4589ccc08b14 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 = 7339774527354376257L;
+    private static final long serialVersionUID = 7339782624956160302L;
 }
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 000c4b1ff464..2d83210769b0 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 = 3824554628370090720L;
+    private static final long serialVersionUID = 3824546530965492939L;
 }
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 739e63ec291e..d67bb4265bab 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 = 1619304249018570390L;
+    private static final long serialVersionUID = -7198877045606756282L;
 
     /** @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 89210edd86cb..b587149ccfcb 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 = -7219599872255883395L;
+    private static final long serialVersionUID = -7219602685080267631L;
 
     /** @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 54f37b1cd629..1f7acf7407dd 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 = 1231356656482373374L;
+    private static final long serialVersionUID = 3620572854502439384L;
 }
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 eac61ad10341..56e068c77541 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 = 1444268311155769787L;
+    private static final long serialVersionUID = 4786163055248098619L;
 
     /** @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 b734539884cf..bbc0f04e4f41 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 = 2894236893705224968L;
+    private static final long serialVersionUID = 2894244991147735207L;
 }
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 1002496411e7..c13def1ee751 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 = 6700989883521222663L;
+    private static final long serialVersionUID = 6700981786064898458L;
 }
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 d3682620f1e3..03e3a80a8554 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 = -1912294340229211191L;
+    private static final long serialVersionUID = -1912286242628001114L;
 }
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 200c3aef798b..ca421949b137 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 = -9104647003554433380L;
+    private static final long serialVersionUID = -5742894380247492769L;
 
     /** @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 c2cb47b5b7a0..258881092180 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 = 1894604845902268280L;
+    private static final long serialVersionUID = 1894594635396608462L;
 
     /** @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 dbadfc732c34..d449a6410374 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 = 2892578975497458876L;
+    private static final long serialVersionUID = 2892578265138548794L;
 
     /** @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 42b0f5bad5fb..c2e1e837b17c 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 = 5787336593518501047L;
+    private static final long serialVersionUID = 5787342505866929473L;
 }
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 891324f7feff..da32bb5a9530 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 = 4908757364594975718L;
+    private static final long serialVersionUID = 4908752356341058912L;
 }
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 d324b202a4fe..9caaacb4bf66 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 = 4322855658863572288L;
+    private static final long serialVersionUID = 4322849741524209078L;
 }
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 3c8e018b819b..08639b2a641f 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 = 5832347702179172035L;
+    private static final long serialVersionUID = 5832349833252895919L;
 
     /** @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 a7d06e519865..4bed82e167ce 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 = 2769374898565354325L;
+    private static final long serialVersionUID = 2769372772914442449L;
 
     /** @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 78facbdf5b7a..be9e811cd47f 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 = 5344589567591594764L;
+    private static final long serialVersionUID = 5344586318411427232L;
 }
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 3c7c1cf42421..d2e7abc9cb9f 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 = -8399053203394100851L;
+    private static final long serialVersionUID = -8399051157658007799L;
 }
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 67db0767ab12..6a448e494596 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 = -860920913785826174L;
+    private static final long serialVersionUID = -860918867942159954L;
 
     /** @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 74e4eb175fdf..7fa49ebd1e5c 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 = 954152183560484981L;
+    private static final long serialVersionUID = 954149892449875185L;
 
     /** @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 f02f6e89c8ce..28781d50f4d1 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 = 6934991933461660461L;
+    private static final long serialVersionUID = 6934988604056448513L;
 }
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 6f411fe3ca1d..93c607caa2c5 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 = 5414534094840670892L;
+    private static final long serialVersionUID = 5414536060349280168L;
 }
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 545d4d9b90c1..c9b6e7537f73 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 = -5190248378115166566L;
+    private static final long serialVersionUID = -5190252137500605017L;
 
     /** @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 7fefc08b2244..142603cb543e 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 = 8893234786603907347L;
+    private static final long serialVersionUID = 8893237890074914818L;
 
     /** @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 c93b784048df..d2b8e61beb35 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 = -1083126807788268150L;
+    private static final long serialVersionUID = 5885691717818121511L;
 
     /** @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 d5dd334e2ad8..84a5028c38e0 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 = 4615626755599106477L;
+    private static final long serialVersionUID = 4615624974745630089L;
 
     /** @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 f9b7e6f89ec0..3bc3ae0317ee 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 = 672593436140896963L;
+    private static final long serialVersionUID = 672596283603341528L;
 
     /** @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 77c24ec1efbb..1381b15200e2 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 = 8654437682641112511L;
+    private static final long serialVersionUID = 8654434744629910573L;
 }
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 2f15b54a9e3c..cdfc8e66fb08 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 = 3694620501187527283L;
+    private static final long serialVersionUID = 3694622191797108065L;
 }
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 629b558cb3f1..422828a5c8b9 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 = 2159701031337428685L;
+    private static final long serialVersionUID = 2159704710656195423L;
 }
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 4e9ae3afccc4..c04cbceb02e8 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 = 1241678618878726186L;
+    private static final long serialVersionUID = 1241675355265551035L;
 }
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 1f04b10d40f9..b5237d39e28c 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 = -2372999412587690509L;
+    private static final long serialVersionUID = 658002573184033630L;
 }
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 60766afc6bf7..7d5477d2df4a 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 = -5450683851654710250L;
+    private static final long serialVersionUID = -4631563497097009341L;
 }
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 f70dae7ed714..59c71a270742 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 = -2358299698365950185L;
+    private static final long serialVersionUID = -6819783329229629758L;
 
     /** @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 31000557d0a1..a418e6878930 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 = 7136457657048783777L;
+    private static final long serialVersionUID = -8276243417143980172L;
 }
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 4811d474277d..70239bf37368 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 = -1088190135706036480L;
+    private static final long serialVersionUID = 4359025217481067817L;
 }
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 f9fd73371015..41bb2c5e68ff 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 = 5182727085065643009L;
+    private static final long serialVersionUID = -6269408338783646488L;
 
     /** @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 d2b31dd9bfdb..f1c23539ed0e 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 = -8163267141021630281L;
+    private static final long serialVersionUID = 6042384259467009694L;
 }
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 897e94d7ddb7..cbde40b5f556 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 = -477024423227646982L;
+    private static final long serialVersionUID = -477021277208824769L;
 }
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 22c53cfe38b9..a3c3d12fdd50 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 = 3485213807531622428L;
+    private static final long serialVersionUID = 3485211983990913241L;
 }
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 d2761284c10d..c85f454ba8b8 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 = 1717378535989783661L;
+    private static final long serialVersionUID = 1717375224681600296L;
 }
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 79675f5f91e4..5fb81b8df2c1 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 = -7384919177797280908L;
+    private static final long serialVersionUID = -7384921166659546575L;
 }
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 fed85565ff3e..1db98e6a73b0 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 = -2733696804324088591L;
+    private static final long serialVersionUID = -2733699113479629900L;
 }
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 90d889f3e11c..8cd31049d32f 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 = 4528106367510638712L;
+    private static final long serialVersionUID = 4528104058373499197L;
 }
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 f708eb12d9ff..c3301569a55a 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 = -477021053848127111L;
+    private static final long serialVersionUID = -477016799771068614L;
 }
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 35f78c2d4cee..17de49927a16 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 = 3485211721741241503L;
+    private static final long serialVersionUID = 3485210174576535388L;
 }
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 7eddc6f50465..6ad1726b9cd0 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 = 1717375166628663534L;
+    private static final long serialVersionUID = 1717371057347832621L;
 }
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 7d5fd70e1b7b..89f49b36ae3e 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 = -7384921263610657289L;
+    private static final long serialVersionUID = -7384917164482168524L;
 }
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 1095c5bafc08..81619b529bcf 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 = 3424380386017108218L;
+    private static final long serialVersionUID = 3424376287049612601L;
 }
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 32a4d6b2237e..c7f4914c2626 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 = -1172597778328827285L;
+    private static final long serialVersionUID = -1172593689550473304L;
 }
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 ccbc9a1babe4..394d3b1d72b6 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 = -1126109010923611374L;
+    private static final long serialVersionUID = -1126107794526507311L;
 }
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 184675c879e5..5c34f062ca37 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 = -2097573351400584462L;
+    private static final long serialVersionUID = -2097577429704609999L;
 }
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 14e3c8f3cacd..b35ccadeced9 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 = -477014713974007247L;
+    private static final long serialVersionUID = -477021394790768308L;
 }
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 57183ced1b32..127affce04a8 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 = 3485212260374015063L;
+    private static final long serialVersionUID = 3485211380807669610L;
 }
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 77b44fb17e77..d5b833fc417c 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 = 1717368971550754854L;
+    private static final long serialVersionUID = 1717374825695331099L;
 }
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 3f31c57003fb..d5c8c4089b0b 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 = -7384920533845369281L;
+    private static final long serialVersionUID = -7384920922667977022L;
 }
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 a3f3f549a0cf..f4ec057d0b1c 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 = 3424372917686114610L;
+    private static final long serialVersionUID = 3424380045074534415L;
 }
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 dac0e66eceb8..1499b29228fd 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 = -1172595775347827805L;
+    private static final long serialVersionUID = -1172598119271435682L;
 }
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 e6294e424440..d75eedb75ad6 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 = -1126111163885384742L;
+    private static final long serialVersionUID = -1126108669990211545L;
 }
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 1ecc03b302ba..6f4ee0ba48f1 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 = -2097580799068091590L;
+    private static final long serialVersionUID = -2097573010467045369L;
 }
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 26379a67525d..2a8a70b9df5d 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 = -7893022452987101641L;
+    private static final long serialVersionUID = -6950728987934116425L;
 
     /** @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 0c24e106779e..99b8b8dc68cf 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 = -3648105171623463557L;
+    private static final long serialVersionUID = 2513380719682838267L;
 }
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 35c8bae64166..56f5f2b5e756 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 = -6396991631405244328L;
+    private static final long serialVersionUID = -6397001377997446471L;
 
     /** @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 9786db898a89..45473f8fabb6 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 = -9066886154342966092L;
+    private static final long serialVersionUID = -9066884755647122385L;
 
     /** @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 f6994a262241..dd58be6b7f58 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 = 2770516387944128820L;
+    private static final long serialVersionUID = -1292103129603132588L;
 
     /** @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 23b0d9d1016d..6eaf68ef9a7e 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 = 5005652371666248566L;
+    private static final long serialVersionUID = 4847148067957965590L;
 
     /** @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 285d0a262ead..a7b25adfd05f 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 = 8770143690734518838L;
+    private static final long serialVersionUID = -4778025238352802389L;
 }
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 e0b55e93f9f9..eb770886b5d3 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 = -7655929341768772856L;
+    private static final long serialVersionUID = -7655930565023227469L;
 
     /** @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 3ffc85b947c9..c711a801885d 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 = -2271122683558516214L;
+    private static final long serialVersionUID = -2271121295033056182L;
 
     /** @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 cea6ed1ce3ce..7c217e31e873 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 = 481719242384645113L;
+    private static final long serialVersionUID = 481709516401765348L;
 
     /** @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 01bdf13e338b..09b716d169a2 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 = -4426882113700457320L;
+    private static final long serialVersionUID = -4426880784663496455L;
 
     /** @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 cc935b7738a3..4094f5718329 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 = 850539139645229668L;
+    private static final long serialVersionUID = 850538115605416441L;
 
     /** @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 aea03fca3dac..0e604dcd6996 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 = -4328904857400220515L;
+    private static final long serialVersionUID = -4328906250935207323L;
 
     /** @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 9f46ce24a521..415d446ff844 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 = -5081812424344329339L;
+    private static final long serialVersionUID = -5081803013341927778L;
 
     /** @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 7240fa0cad72..15cd6c863e89 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 = 643091256041656947L;
+    private static final long serialVersionUID = 643089751529426664L;
 
     /** @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 25c0a9a472a7..b658f67a8a80 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 = -2438008392667555542L;
+    private static final long serialVersionUID = -2437998870876343309L;
 
     /** @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 f483af41838d..624e8f642ef1 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 = 3651534770503112780L;
+    private static final long serialVersionUID = 3651536138397379031L;
 
     /** @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 0b577693319d..5eb6cf4b7940 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 = 8804377150008364265L;
+    private static final long serialVersionUID = 8804375955480684274L;
 
     /** @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 bcc1606d0d53..32ede5f73d0e 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 = -5353756458101549281L;
+    private static final long serialVersionUID = -5353758011815404156L;
 
     /** @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 c369488e8b31..ea48179b5583 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 = -6522145342543456056L;
+    private static final long serialVersionUID = -6522143799317812069L;
 
     /** @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 0a66d3736c12..71f38c28560c 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 = 7620282667183096651L;
+    private static final long serialVersionUID = 7620281307352472984L;
 
     /** @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 58f3a764cca0..2ffc6ef7a8e4 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 = -8432767862089252890L;
+    private static final long serialVersionUID = -2333555077155372769L;
 }
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 92e2ac60b665..f5a0a6ed931a 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 = -562037203864355926L;
+    private static final long serialVersionUID = 7178816268520541687L;
 
     /** @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 50cf0f8ab8d4..18b23dabf800 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 = 6721294303809755494L;
+    private static final long serialVersionUID = 2361090598243610939L;
 }
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 db0fd189d11a..46177b3a1de5 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 = -9066888096754147319L;
+    private static final long serialVersionUID = -9066880040573675414L;
 
     /** @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 c5ea5e78a85e..e4013de8916f 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 = 4737685250735410025L;
+    private static final long serialVersionUID = -6374510166938237644L;
 
     /** @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 1cfa4da9ed24..054911274989 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 = 340765227866489098L;
+    private static final long serialVersionUID = -3292257881389268585L;
 
     /** @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 de7ac2050e50..e48c44e258e1 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 = 1951917237658810227L;
+    private static final long serialVersionUID = -4049668273732185293L;
 
     /** @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 bbf6b6057b07..b68048206f00 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 = -8334753134853347153L;
+    private static final long serialVersionUID = -8550215578743926645L;
 }
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 fc985470bba9..8105efa99c04 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 = -7655927165859719593L;
+    private static final long serialVersionUID = -7655919074747769689L;
 
     /** @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 9976e55fc880..5e48b511a385 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 = -2271124646471195410L;
+    private static final long serialVersionUID = -2271132785147753713L;
 
     /** @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 f5f0e038b59b..489e57aaf2a9 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 = 4147524381943415248L;
+    private static final long serialVersionUID = 4147532686306309038L;
 
     /** @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 898f12cab64c..7d6a7b771ffc 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 = 481713107999236959L;
+    private static final long serialVersionUID = 481704969060184417L;
 
     /** @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 01fc9d78fc54..804895a233c7 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 = 643086480320589582L;
+    private static final long serialVersionUID = 643078258832078381L;
 
     /** @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 b959927bd67d..baacf7f3f77d 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 = -2438000984925005679L;
+    private static final long serialVersionUID = -2438003590954452874L;
 
     /** @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 b17d720d27a3..9842f8e8e27c 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 = -2078233864397132207L;
+    private static final long serialVersionUID = -6343566989718869287L;
 
     /** @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 f796b12931dd..cc1aeeb8f069 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 = -8813708384542522326L;
+    private static final long serialVersionUID = -8813705535411200951L;
 
     /** @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 bcada8004d02..8459eb7b72c9 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 = 4410703690596979509L;
+    private static final long serialVersionUID = 4410695571304503783L;
 }
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 c309ade7f932..e88581b104f4 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 = 3651532759914960878L;
+    private static final long serialVersionUID = 3651524648140377362L;
 
     /** @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 a0f7fc71d9f3..973f7cc720fa 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 = 8804372246382254795L;
+    private static final long serialVersionUID = 8804375052659117751L;
 
     /** @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 46a41a676dbb..b3b05de9dacb 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 = -4989057500882525938L;
+    private static final long serialVersionUID = -4989065617671322574L;
 
     /** @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 7f832284d7b5..15c8a669d518 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 = -5353754282053699331L;
+    private static final long serialVersionUID = -5353757111576773567L;
 
     /** @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 6abd987a1724..5ad2dc3e586a 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 = -6522141850420238087L;
+    private static final long serialVersionUID = -6522133794239561698L;
 
     /** @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 339cd7a34e7c..b8556ab88275 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 = 7620283336327893434L;
+    private static final long serialVersionUID = 7620286025009051805L;
 
     /** @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 77ff72eb9515..89962205def6 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 = -5771544267247752293L;
+    private static final long serialVersionUID = 2119946384014634143L;
 }
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 07bcd6f6e2e2..c8cf4bbb0087 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 = -3136663444921354851L;
+    private static final long serialVersionUID = -3137493914321663140L;
 
     /** @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 a17b09f44cea..f3916a108355 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 = 5146762354585810695L;
+    private static final long serialVersionUID = 5945996243018845852L;
 }
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 c75e807f3dbe..67a11a704054 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 = 4481592101954014854L;
+    private static final long serialVersionUID = 8213898029803734493L;
 
     /** @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 cce4afea3f6c..863ad3269ba1 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 = 7681265418320705866L;
+    private static final long serialVersionUID = -769035955762709487L;
 }
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 108bace0f122..c7fc6181b31e 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 = 3693795732516439397L;
+    private static final long serialVersionUID = 5755605056906722494L;
 
     /** @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 401ecd08b75e..3f2870adec5a 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 = 6372150591578038534L;
+    private static final long serialVersionUID = 562709250750605597L;
 
     /** @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 5f19a8c94365..9cfb2439240d 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 = 2974182537733000115L;
+    private static final long serialVersionUID = 2850590630524049267L;
 
     /** @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 0682898b638b..641e06f5fe10 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 = -3000163412085021948L;
+    private static final long serialVersionUID = 2725485146314068057L;
 }
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 d4f361a16a0f..e2eb3d2fd8da 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 = -7655923247507362644L;
+    private static final long serialVersionUID = -7655922564141536506L;
 
     /** @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 1af186a4a099..d54378a41995 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 = -2271128777951876052L;
+    private static final long serialVersionUID = -2271129295873836281L;
 
     /** @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 88df4de7b58d..3407383eb800 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 = 4147528513495154616L;
+    private static final long serialVersionUID = 4147529196738914426L;
 
     /** @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 5bb0484e18e8..688d58665239 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 = 481708976411673719L;
+    private static final long serialVersionUID = 481708332063857589L;
 
     /** @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 1488cd916f32..51a174ff0111 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 = 643079706491842508L;
+    private static final long serialVersionUID = 643079188568334429L;
 
     /** @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 563118134c97..40d12ba2fc15 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 = -2438007763771062154L;
+    private static final long serialVersionUID = -2438007566128193100L;
 
     /** @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 9e9aaa466a96..fa74a0221ad3 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 = -1011493474543832230L;
+    private static final long serialVersionUID = 1960559565689493698L;
 
     /** @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 293a588a1973..0c0eaa6a9911 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 = -8813709708220177432L;
+    private static final long serialVersionUID = -8813709905859337479L;
 
     /** @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 64d7e72b5c29..b180c308f6f0 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 = 4410691398363228979L;
+    private static final long serialVersionUID = 4410691562281064777L;
 }
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 7f57d117a7ab..8c197cfd94ba 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 = 3651528655484215415L;
+    private static final long serialVersionUID = 3651528819415984135L;
 
     /** @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 9ae62ba24270..6f79f30f26b7 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 = 8804376500463296338L;
+    private static final long serialVersionUID = 8804376984699969186L;
 
     /** @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 c2ded2c884f4..824d0cae804b 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 = -4989066900023609065L;
+    private static final long serialVersionUID = -4989066901404614745L;
 
     /** @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 3471b0afc580..4d734931d64d 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 = -5353761284380875676L;
+    private static final long serialVersionUID = -5353760921412139052L;
 
     /** @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 4a34bbda7e83..284c8ceb9d09 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 = -6522135076591318885L;
+    private static final long serialVersionUID = -6522134597551356798L;
 
     /** @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 340d709f5a43..0163ac52a275 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 = 7620287472820515608L;
+    private static final long serialVersionUID = 7620287791718160001L;
 
     /** @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 31f58a0f3c93..42e7f8498bfc 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 = -3972172762045939952L;
+    private static final long serialVersionUID = 1357395247311876561L;
 }
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 54ff2352e03d..5d2656ad1603 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 = 141696120918485548L;
+    private static final long serialVersionUID = -2820410619122227435L;
 
     /** @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 0847e5b1ab28..789670a13639 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 = -3674480256648575752L;
+    private static final long serialVersionUID = 3105117445678291362L;
 }
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 4cb395799e4b..d209f3951d00 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 = 8002505700222685620L;
+    private static final long serialVersionUID = -2999717538054085164L;
 }
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 02019307e8fa..7b85d2a4705b 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 = 2700135962592765116L;
+    private static final long serialVersionUID = -4377303936176488280L;
 
     /** @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 d55a7ad4726c..f7067b0e65e6 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 = 5734225415815155852L;
+    private static final long serialVersionUID = 5734231249355086534L;
 }
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 d8510da0f4f2..18cd58ba48c1 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 = -6116924828430798557L;
+    private static final long serialVersionUID = 1984818035671479374L;
 
     /** @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 d189cc23b675..74d033a5a624 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 = 5516868750155787888L;
+    private static final long serialVersionUID = -5324757049266146096L;
 }
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 b87c3b1f6fd2..75032839004a 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 = 3990284757461893908L;
+    private static final long serialVersionUID = -6642378531033137387L;
 
     /** @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 7def8947c7b8..484e3a48d17e 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 = -7483192632525168801L;
+    private static final long serialVersionUID = -8457708487234715970L;
 }
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 38aa18456c5a..d5f3efca0b8f 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 = -4780651561693518660L;
+    private static final long serialVersionUID = -4439740294917613444L;
 }
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 764839c8026d..c7b873be720a 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 = -943479388054960828L;
+    private static final long serialVersionUID = -943479491365256681L;
 }
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 210b59ab2994..7f88e8b0d9eb 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 = 5893235237495300913L;
+    private static final long serialVersionUID = 8180009575751362850L;
 
     /** @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 d7a8fca0d238..adcc25ba898e 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 = -2944657464786556609L;
+    private static final long serialVersionUID = -2944657366480995348L;
 }
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 f346648f690f..c579a7d5f249 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 = 7283524587506805303L;
+    private static final long serialVersionUID = -958885512953944585L;
 }
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 a22ebe384d07..5a17a7befac4 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 = 8481866758909849726L;
+    private static final long serialVersionUID = 1833629938456544094L;
 
     /** @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 74630d0b94e3..62fda232cc8a 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 = -4482640575648470644L;
+    private static final long serialVersionUID = 5446271412685850270L;
 
     /** @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 4834c0c401cf..de3f8eabc99d 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 = -1840355964380478433L;
+    private static final long serialVersionUID = -4036685348966970945L;
 
     /** @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 45de72443bbc..48c80e7513b4 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 = -3172274753028705612L;
+    private static final long serialVersionUID = -3172281429748745607L;
 
     /** @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 0925386bb9c9..b6abcb7448d9 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 = -5542862018803871757L;
+    private static final long serialVersionUID = -5542857950677310883L;
 }
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 a8af7394977e..d3a2e00f7b56 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 = -5849475816842427320L;
+    private static final long serialVersionUID = -8021688148000159055L;
 }
diff --git a/slice2java/js/test/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/Glacier2/router/Test/CallbackException.java
index eed118086306..0919cdc36506 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 = 193725940569929943L;
+    private static final long serialVersionUID = -2044554499299085097L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Base.java b/slice2java/js/test/Ice/defaultValue/Test/Base.java
index 7f65193c447f..afa33b938aef 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 = 9149446116016371874L;
+    private static final long serialVersionUID = 6746145785526714150L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java
index 3c3c438c6ddb..add42a8aa19d 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 = 285704726783263318L;
+    private static final long serialVersionUID = -5461555911997847470L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 20b79e06ef9e..0605609c9563 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 = 8928781523702161803L;
+    private static final long serialVersionUID = 1284196522440315602L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 6b3edf80999e..cc7cbcddcf17 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 = 1693115956512482595L;
+    private static final long serialVersionUID = -76522798726040847L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/Ice/defaultValue/Test/Derived.java
index 856efe12ad50..e18f6f8ba5ee 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 = -5164914699774878650L;
+    private static final long serialVersionUID = -5814489743853381705L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java
index ae80c6e62d61..5105e98201ac 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 = 7031160053409618161L;
+    private static final long serialVersionUID = 7971603425742560768L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index 1967728baf64..68bf9fc2faa0 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 = 7640771238784554223L;
+    private static final long serialVersionUID = 5512882422946619958L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index 9d14900a862f..21bb99c92e38 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 = -8508326653110174381L;
+    private static final long serialVersionUID = 8529606953627814913L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java
index c117e455f490..afe75894ce93 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 = 5127391944988492692L;
+    private static final long serialVersionUID = 5127389041707494332L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java
index 92e0143b21f0..534a5ec42e5b 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 = -3233036129991732924L;
+    private static final long serialVersionUID = -6226945881939329871L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java
index 2dc9d8ea071c..8a13b89438ef 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 = -1033676268984676645L;
+    private static final long serialVersionUID = -3342322708608555475L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java
index bee999e7ec52..e4f9ae3b9594 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 = 8776859622719671110L;
+    private static final long serialVersionUID = -1961895560855850573L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java
index 85e41c6a6879..4c7ed4a1b1fd 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 = 6122500057611032496L;
+    private static final long serialVersionUID = 2429295305142907828L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/A.java b/slice2java/js/test/Ice/exceptions/Test/A.java
index 2493df500306..87f3b8624bca 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 = 7823741975956176448L;
+    private static final long serialVersionUID = 7823741982331135177L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/B.java b/slice2java/js/test/Ice/exceptions/Test/B.java
index b69eda519338..05742f9e7242 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 = -3861419377716540288L;
+    private static final long serialVersionUID = -3861419371346042103L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/C.java b/slice2java/js/test/Ice/exceptions/Test/C.java
index 6b2fb357bccc..886d11583686 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 = 1080695667158961728L;
+    private static final long serialVersionUID = 1080695673533920457L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/D.java b/slice2java/js/test/Ice/exceptions/Test/D.java
index 7575aa00d2dc..a40b219e423e 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 = 4780372890385537920L;
+    private static final long serialVersionUID = 4780372896756036105L;
 }
diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/Ice/inheritance/Test/MC/A.java
index 19aee820287b..0558f10201f4 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 = 954230006244647798L;
+    private static final long serialVersionUID = 954232112613881833L;
 
     /** @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 acdefef7568a..e64e9e66c16d 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 = 1339643307659888748L;
+    private static final long serialVersionUID = 1339641116051760499L;
 
     /** @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 310b71dd02b4..cb18f91127a5 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 = -2729307889104990482L;
+    private static final long serialVersionUID = -2729304460253582479L;
 
     /** @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 ea6ed6078ba3..48fa28263125 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 = -3435399461976741272L;
+    private static final long serialVersionUID = -3435401653575957129L;
 
     /** @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 3fbd4b62903e..6ceb4d7ce46d 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 = -836185854314727247L;
+    private static final long serialVersionUID = -836183828166431954L;
 
     /** @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 3c32b1e14153..d3d95ffa82da 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 = 1132526649848793484L;
+    private static final long serialVersionUID = 1132530078700062227L;
 
     /** @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 44c1b10c30fd..f584d048a92d 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 = -6335551276748650738L;
+    private static final long serialVersionUID = -6335553137750047983L;
 
     /** @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 bb0c9ac733fa..5b0dda4d200e 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 = -4007416623406376312L;
+    private static final long serialVersionUID = -4007413194546195177L;
 
     /** @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 6a44b0711855..b7b86efb7dd8 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 = 991429454655907568L;
+    private static final long serialVersionUID = 991425940574517743L;
 
     /** @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 191ebf91ebf9..2af4765f0dc6 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 = -2880329929165182804L;
+    private static final long serialVersionUID = -2880326831081507789L;
 
     /** @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 e505581df28f..25755478cd96 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 = -8808263431011283154L;
+    private static final long serialVersionUID = -8808265622771074255L;
 
     /** @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 7f858186ca16..23777348f42d 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 = -771859498244367448L;
+    private static final long serialVersionUID = -771856400151780041L;
 
     /** @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 f40691c0ddfb..f0f3289fa046 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 = 6566349866675826227L;
+    private static final long serialVersionUID = 6566346602980655404L;
 
     /** @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 77ca7c90e002..3155d77ebc0b 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 = 6983809185298409420L;
+    private static final long serialVersionUID = 6983806993832874963L;
 
     /** @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 5c70b8c990f8..d63fdadf4e46 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 = -1175220745993328562L;
+    private static final long serialVersionUID = -1175217316990126895L;
 
     /** @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 2320bd37f4af..f0d1463b776a 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 = -3279719300973737016L;
+    private static final long serialVersionUID = -3279721492430359081L;
 
     /** @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 48b2d48c1d1f..73e2ecf95c64 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 = -4359181994185000078L;
+    private static final long serialVersionUID = -4359179887806853651L;
 
     /** @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 60660986b636..613bc3e043be 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 = 5904700095211276780L;
+    private static final long serialVersionUID = 5904697903603148531L;
 
     /** @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 5deb47f91d7b..686759745a2a 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 = 1835748898446397550L;
+    private static final long serialVersionUID = 1835752327297805553L;
 
     /** @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 c12b68321693..282bc20e1411 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 = -2252400115207058456L;
+    private static final long serialVersionUID = -2252402306806274313L;
 
     /** @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 00eb333f4b93..d5a1f5812fd7 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 = -1203533696912654659L;
+    private static final long serialVersionUID = -1203531670792245470L;
 
     /** @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 be9263f0e6b5..cd1c6a42ed97 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 = -7537765381738491636L;
+    private static final long serialVersionUID = -7537761952887222893L;
 
     /** @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 3026bc29ce24..74d199a3e054 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 = 3440900765373615758L;
+    private static final long serialVersionUID = 3440898904372218513L;
 
     /** @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 4b446b55245e..100c47124070 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 = 9151092859497595400L;
+    private static final long serialVersionUID = 9151096288357776535L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/A.java b/slice2java/js/test/Ice/objects/Test/A.java
index a1a387237deb..857f169ced95 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 = 4594182816966237719L;
+    private static final long serialVersionUID = -1951122274218269848L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/A1.java b/slice2java/js/test/Ice/objects/Test/A1.java
index 4883f8b43708..55cbc6875339 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 = -5926739205969639806L;
+    private static final long serialVersionUID = -5926739279655160164L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/B.java b/slice2java/js/test/Ice/objects/Test/B.java
index 225ae0f3910d..9227f185474e 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 = -8890911863535524113L;
+    private static final long serialVersionUID = -8890911776879047801L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/B1.java b/slice2java/js/test/Ice/objects/Test/B1.java
index beeac6e170b8..87ecbfd398ee 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 = -6837824012201399548L;
+    private static final long serialVersionUID = 2557191658236317764L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Base.java b/slice2java/js/test/Ice/objects/Test/Base.java
index e814398e6f03..9c155922124f 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 = -5250453449130647760L;
+    private static final long serialVersionUID = -2746134739544913366L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/C.java b/slice2java/js/test/Ice/objects/Test/C.java
index 7ef62e1d22a5..487010f704e0 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 = 1678003583587267275L;
+    private static final long serialVersionUID = -5630268864510610671L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/COneMember.java b/slice2java/js/test/Ice/objects/Test/COneMember.java
index a3def95644bc..34cdf96d2506 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 = 3050965099031002918L;
+    private static final long serialVersionUID = 3050965007402279447L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java
index 621dd9472565..214ce91d41e9 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 = 768037452911711899L;
+    private static final long serialVersionUID = -8577215883467044389L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/D.java b/slice2java/js/test/Ice/objects/Test/D.java
index 78b75f0c282d..af592f1c43cf 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 = -6113083519266862916L;
+    private static final long serialVersionUID = -1566569832624756117L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/D1.java b/slice2java/js/test/Ice/objects/Test/D1.java
index a85451734837..1b401a56c9d6 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 = 2604335149102363971L;
+    private static final long serialVersionUID = 6478623261495920515L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/E.java b/slice2java/js/test/Ice/objects/Test/E.java
index 41d53c301aae..5da02d25baa0 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 = -7693793455378363338L;
+    private static final long serialVersionUID = 8093975707165768966L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/EBase.java b/slice2java/js/test/Ice/objects/Test/EBase.java
index 040340757bd3..74c986057c2e 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 = -4626318982328738866L;
+    private static final long serialVersionUID = 3780219626938668302L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/EDerived.java b/slice2java/js/test/Ice/objects/Test/EDerived.java
index db23ae6d8168..a099f3eaeedb 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 = -4837976943909223214L;
+    private static final long serialVersionUID = -5304860210066859758L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/EOneMember.java b/slice2java/js/test/Ice/objects/Test/EOneMember.java
index dd21a73325c2..55a3fca36c0b 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 = -6225280116071396759L;
+    private static final long serialVersionUID = -6225280024326248296L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java
index 947c32bdd8c5..93e043077406 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 = 5191010156350538516L;
+    private static final long serialVersionUID = 4657773146410952532L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/F.java b/slice2java/js/test/Ice/objects/Test/F.java
index adbb4a0a4e26..8de184e20f52 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 = -4927464926395631343L;
+    private static final long serialVersionUID = 7240046026115588305L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/F1.java b/slice2java/js/test/Ice/objects/Test/F1.java
index 0b09b33ce2cb..7acae27a2731 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 = 6192374138292356648L;
+    private static final long serialVersionUID = 6192373444871223515L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/F3.java b/slice2java/js/test/Ice/objects/Test/F3.java
index 55a008ef068c..2c1bd58c0cb1 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 = -3216691190450435537L;
+    private static final long serialVersionUID = -8303335729550296599L;
 
     /** @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 7cf6abbce7bb..9bccb4846499 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 = -1425254159814167419L;
+    private static final long serialVersionUID = -1425254233603716819L;
 
     /** @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 967e3f1b955d..250fdcf74bcf 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 = -2337225212872531525L;
+    private static final long serialVersionUID = -2337225289158737627L;
 }
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 1d943d528bac..8fde09ac20d9 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 = -1298688898874410829L;
+    private static final long serialVersionUID = -1298688838156915324L;
 
     /** @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 88107ed28d1a..0499f7037474 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 = 1842226227016394975L;
+    private static final long serialVersionUID = 1842226135398610881L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/K.java b/slice2java/js/test/Ice/objects/Test/K.java
index d7a1b3882485..9f7b6bddc442 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 = 4645160712752317745L;
+    private static final long serialVersionUID = 4645160525588321669L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/L.java b/slice2java/js/test/Ice/objects/Test/L.java
index c19da28d285c..b82483984a63 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 = 6629743233574538057L;
+    private static final long serialVersionUID = 6629743317583454039L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/M.java b/slice2java/js/test/Ice/objects/Test/M.java
index 3b8d38a4a73c..03cff9e12bfd 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 = -8088101506378968053L;
+    private static final long serialVersionUID = -8088101314198819016L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Recursive.java b/slice2java/js/test/Ice/objects/Test/Recursive.java
index 1b27f676c3c8..277e48900140 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 = 3617887387880605471L;
+    private static final long serialVersionUID = 3617887200709581994L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/S.java b/slice2java/js/test/Ice/objects/Test/S.java
index b2d36a17a4f6..bcef224c8286 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 = 481773198504692218L;
+    private static final long serialVersionUID = 481773119785119972L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/SOneMember.java b/slice2java/js/test/Ice/objects/Test/SOneMember.java
index 70beef3a94c9..09ae6ff5a0d3 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 = 6227749395219854335L;
+    private static final long serialVersionUID = 6227749311223718158L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/Ice/objects/Test/STwoMembers.java
index e816b0c49ee7..aec9011aacfc 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 = 5856667252360950402L;
+    private static final long serialVersionUID = 6287650331237801666L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/StructKey.java b/slice2java/js/test/Ice/objects/Test/StructKey.java
index 436a65d2d333..c823f8a8a997 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 = -3828221639719697670L;
+    private static final long serialVersionUID = 2639920393810708554L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java
index a862655dfcef..34ebae1ec230 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 = 2723842798335289720L;
+    private static final long serialVersionUID = 2723843861428125972L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/MyClass1.java b/slice2java/js/test/Ice/operations/Test/MyClass1.java
index 863da8327b76..ac3df08e7778 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 = -3083228514555050149L;
+    private static final long serialVersionUID = 5483494589270425859L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct.java b/slice2java/js/test/Ice/operations/Test/MyStruct.java
index 207f751ba1cc..fecdb716fb21 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 = -4668565877530649187L;
+    private static final long serialVersionUID = 8707882703844857949L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/Ice/operations/Test/MyStruct1.java
index 9a239f7def4e..6b8f92a9d374 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 = 7931608376274908978L;
+    private static final long serialVersionUID = -2929994761536284694L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/Structure.java b/slice2java/js/test/Ice/operations/Test/Structure.java
index 00764fc58598..090d4fa17e57 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 = 1237822415101956211L;
+    private static final long serialVersionUID = -2510145748790483904L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/A.java b/slice2java/js/test/Ice/optional/Test/A.java
index 90ec312f4728..b1f329e1e4a1 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 = -6831456273654467312L;
+    private static final long serialVersionUID = -5665376674774385392L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/B.java b/slice2java/js/test/Ice/optional/Test/B.java
index f7822f2da26c..314148d5ca4b 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 = -8095352915392437213L;
+    private static final long serialVersionUID = 3870850001914134115L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/C.java b/slice2java/js/test/Ice/optional/Test/C.java
index b00f68142067..a5ef4a959d7d 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 = 4968661035110480765L;
+    private static final long serialVersionUID = 9048826674322795965L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/DerivedException.java b/slice2java/js/test/Ice/optional/Test/DerivedException.java
index 6571ff64a081..3a4efa1ac8de 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 = 4619303864327780947L;
+    private static final long serialVersionUID = -2354349122884585036L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/E.java b/slice2java/js/test/Ice/optional/Test/E.java
index 389f0be1c4cb..d1ec901c86e1 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 = -1850744199821490505L;
+    private static final long serialVersionUID = -1850739187743874671L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/F.java b/slice2java/js/test/Ice/optional/Test/F.java
index d44ce8c6a37c..26797d59c572 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 = -6430498995657972156L;
+    private static final long serialVersionUID = -6430492782139167902L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/Ice/optional/Test/FixedStruct.java
index 233f70e737db..7a4cb6b9ac74 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 = 1569603235017411272L;
+    private static final long serialVersionUID = 1569601435921956575L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/G.java b/slice2java/js/test/Ice/optional/Test/G.java
index 074f76218f29..5fa1c8a4b423 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 = -7450058439025988781L;
+    private static final long serialVersionUID = -5786212698605222317L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/G1.java b/slice2java/js/test/Ice/optional/Test/G1.java
index ecfaa096387b..201074613e01 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 = 7339782422119730525L;
+    private static final long serialVersionUID = 7339784872073077114L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/G2.java b/slice2java/js/test/Ice/optional/Test/G2.java
index a3051f80c426..539d1d76672d 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 = 3824546413521736905L;
+    private static final long serialVersionUID = 3824551425596475420L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/Ice/optional/Test/MultiOptional.java
index c8f80dcbe41b..3d425aca2db6 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 = 7792563332229860787L;
+    private static final long serialVersionUID = 7047131335575414497L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/OneOptional.java b/slice2java/js/test/Ice/optional/Test/OneOptional.java
index eba24296e050..300e873448ac 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 = -7219602482246490394L;
+    private static final long serialVersionUID = -7219599482237768207L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/OptionalException.java b/slice2java/js/test/Ice/optional/Test/OptionalException.java
index 31d8116ed287..78248771a8b9 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 = 2403470184724858942L;
+    private static final long serialVersionUID = 6152727243243340795L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java
index 8a0d0a1ba98a..5d5400d2342c 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 = -2357835906298146501L;
+    private static final long serialVersionUID = 764505565715232571L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/RequiredException.java b/slice2java/js/test/Ice/optional/Test/RequiredException.java
index c8610ebd7215..f2f697310a49 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 = 2894244543084049684L;
+    private static final long serialVersionUID = 2894238650147340531L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/Ice/optional/Test/SmallStruct.java
index 6f0ee13845a3..b3a3985d466d 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 = 6700981583230588257L;
+    private static final long serialVersionUID = 6700988127109134869L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/VarStruct.java b/slice2java/js/test/Ice/optional/Test/VarStruct.java
index d7abe86b72da..7c586d3ca4b1 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 = -1912286445464430891L;
+    private static final long serialVersionUID = -1912283995511084302L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/WD.java b/slice2java/js/test/Ice/optional/Test/WD.java
index 5dfb1cfae891..0091f4b0e98f 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 = -8817311699548929989L;
+    private static final long serialVersionUID = -4801050030168644117L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C.java b/slice2java/js/test/Ice/scope/Test/C.java
index 3bf3d22dcea7..6e23000e530f 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 = -5190250149999503976L;
+    private static final long serialVersionUID = -5190251394980209836L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C1.java b/slice2java/js/test/Ice/scope/Test/C1.java
index 7dbe03a71bc3..12c93daefe54 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 = 8893230282133468141L;
+    private static final long serialVersionUID = 8893231847388370581L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C2.java b/slice2java/js/test/Ice/scope/Test/C2.java
index 4b1ba539176f..c49e9669aca4 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 = -2493488116476487757L;
+    private static final long serialVersionUID = -2655171039848202476L;
 
     /** @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 d3ba6f210829..bdd42daffe2b 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 = 4615625800043705097L;
+    private static final long serialVersionUID = 4615629689810430284L;
 
     /** @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 853e571fa8ab..5f19625e77eb 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 = 672580578272140320L;
+    private static final long serialVersionUID = 672584788483835208L;
 
     /** @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 b3ea11627657..5d6e5234f133 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 = 8654442352574122608L;
+    private static final long serialVersionUID = 8654440787318633712L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/Inner/S.java b/slice2java/js/test/Ice/scope/Test/Inner/S.java
index 7fa8505e427d..44d07af4d0cb 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 = 3694613268979620924L;
+    private static final long serialVersionUID = 3694612023995094204L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S.java b/slice2java/js/test/Ice/scope/Test/S.java
index 0cc7e324427c..05f0e8f6546a 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 = 2159705535967286402L;
+    private static final long serialVersionUID = 2159709425876122754L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S1.java b/slice2java/js/test/Ice/scope/Test/S1.java
index b43760b286fe..410f0fd37f8b 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 = 1241671882582152276L;
+    private static final long serialVersionUID = 1241676092781071916L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S2.java b/slice2java/js/test/Ice/scope/Test/S2.java
index b6bf3e78e6c6..9d935c4f4866 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 = -8124654806251592630L;
+    private static final long serialVersionUID = -6952597424304905235L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java
index b2aeb2bed4b4..bc738ce800c5 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 = -477016940453129214L;
+    private static final long serialVersionUID = -477023657454111152L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 184da5eba166..5140a7a3f401 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 = 3485210209510687652L;
+    private static final long serialVersionUID = 3485214242689079670L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 274dfad83819..2ebe98d2276f 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 = 1717371218692928853L;
+    private static final long serialVersionUID = 1717377935693910791L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index c802596a9fef..91808d399b3d 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 = -7384917150210768628L;
+    private static final long serialVersionUID = -7384918572193077666L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java
index c0ee4a4b9e6b..c6d5487b3019 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 = -2733702799166123063L;
+    private static final long serialVersionUID = -2733707031382454117L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
index 75007e7e1b1b..eefaa7a21827 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 = 4528108395124455424L;
+    private static final long serialVersionUID = 4528096062820744274L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/B.java b/slice2java/js/test/Ice/slicing/objects/Test/B.java
index 78fdff5afa46..3ded60ad4ac9 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 = -8507277286914266148L;
+    private static final long serialVersionUID = -1426138718908668375L;
 
     /** @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 0d249dc64954..512788b17aea 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 = 2936000823961608976L;
+    private static final long serialVersionUID = 7401491265267637733L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 1ee8ab0cbcd2..87291ad7604c 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 = -6396999172357208970L;
+    private static final long serialVersionUID = -6396997339842449874L;
 
     /** @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 216ec806de8a..0af0bfe22fcf 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 = -9066884065965873093L;
+    private static final long serialVersionUID = -9066888545992844873L;
 
     /** @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 5379b842d7a6..58167fd6f0dd 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 = 5802185306781530527L;
+    private static final long serialVersionUID = -2633326078277754006L;
 
     /** @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 0ffc2ffe9fe7..a7401f961b70 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 = 8429405174959295325L;
+    private static final long serialVersionUID = 3505925113970413736L;
 
     /** @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 0ed14f64d80d..61c95f5ef8eb 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 = 7547739922109686995L;
+    private static final long serialVersionUID = -2270863989759444758L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java
index 5d8ab8c29026..e570dd903a0c 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 = -7655925954389675422L;
+    private static final long serialVersionUID = -7655927104946098984L;
 
     /** @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 8b6037f0c609..a1a55dd30a02 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 = -2271126236154978692L;
+    private static final long serialVersionUID = -2271125085530718128L;
 
     /** @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 b5f66cd03dbe..dcdd88c8cf23 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 = 481711722223896140L;
+    private static final long serialVersionUID = 481712872760093568L;
 
     /** @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 ab488fb24392..94216546eed5 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 = -4426884364500764490L;
+    private static final long serialVersionUID = -4426882531976944658L;
 
     /** @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 f56d2c5beb10..97d604212243 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 = 850541199479688721L;
+    private static final long serialVersionUID = 850540219265460957L;
 
     /** @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 3418f6f39064..1d3a3fc464c9 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 = -4328901309824651727L;
+    private static final long serialVersionUID = -4328907910611259076L;
 
     /** @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 1b7b1df6e71e..6092db7ebe22 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 = -5081815974658630707L;
+    private static final long serialVersionUID = -5081806726375089969L;
 
     /** @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 9dfe5e98ecb4..21bdd4271d65 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 = 643082245709044732L;
+    private static final long serialVersionUID = 643086043835214832L;
 
     /** @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 923c818cf67c..85872820b31f 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 = -2438010305567657283L;
+    private static final long serialVersionUID = -2438000545734437060L;
 
     /** @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 bef8f25c1393..b56ee423b8a2 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 = 3651531197099206916L;
+    private static final long serialVersionUID = 3651533029598016134L;
 
     /** @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 60a8285014ef..95cf54370a75 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 = 8804379039495003425L;
+    private static final long serialVersionUID = 8804372609190944675L;
 
     /** @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 859d17b4a630..a2b082053a85 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 = -5353763991303209769L;
+    private static final long serialVersionUID = -5353754231613703851L;
 
     /** @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 3a36771ec1b5..f512f1dc2b4d 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 = -6522137654536114539L;
+    private static final long serialVersionUID = -6522141452710068881L;
 
     /** @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 28d693e98ad7..a1671f87ee1a 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 = 7620290177143091478L;
+    private static final long serialVersionUID = 7620283746789359660L;
 
     /** @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 bbfa0641da2c..6f0820fba0ef 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 = -438460569429652524L;
+    private static final long serialVersionUID = 863927382210545362L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/LargeStruct.java b/slice2java/js/test/Ice/stream/Test/LargeStruct.java
index e90198f7cd36..e5c753ce602b 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 = 3955515013394965210L;
+    private static final long serialVersionUID = -6031697344631635521L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/MyClass.java b/slice2java/js/test/Ice/stream/Test/MyClass.java
index 54c1ae1ecf9d..6508956545ca 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 = -330931703635140429L;
+    private static final long serialVersionUID = 8968608804698276761L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/stream/Test/MyException.java b/slice2java/js/test/Ice/stream/Test/MyException.java
index 47ab878fe61e..9bb12a00e80e 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 = 5734227429187624320L;
+    private static final long serialVersionUID = 5734224232804004139L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/Ice/stream/Test/OptionalClass.java
index 56023c75a743..935177e3c711 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 = -7977309270459483082L;
+    private static final long serialVersionUID = -1304464705892960761L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/Clash/Cls.java b/slice2java/js/test/Slice/escape/Clash/Cls.java
index 0ad447f6b83d..06930a45209c 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 = -2978899749232542727L;
+    private static final long serialVersionUID = -3404636968680642919L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/Clash/Ex.java b/slice2java/js/test/Slice/escape/Clash/Ex.java
index f5487c4c0f8b..39f7f8daae84 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 = 4487899629329440337L;
+    private static final long serialVersionUID = -5382277177347958431L;
 }
diff --git a/slice2java/js/test/Slice/escape/Clash/St.java b/slice2java/js/test/Slice/escape/Clash/St.java
index 8a7d8b9d1d76..d98924e7d494 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 = 752328340062581043L;
+    private static final long serialVersionUID = -6143210729181006084L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/BaseMethods.java b/slice2java/js/test/Slice/escape/await/BaseMethods.java
index 84cf1b15919d..0430accb808c 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 = -7037238149255002588L;
+    private static final long serialVersionUID = -1377994973656114848L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/_break.java b/slice2java/js/test/Slice/escape/await/_break.java
index 40f013cb1447..d9801eea3182 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 = 1013944036807832113L;
+    private static final long serialVersionUID = 3229370184846417525L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/_package.java b/slice2java/js/test/Slice/escape/await/_package.java
index 91038196d57f..b0ce84f8592a 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 = -6557120925288065703L;
+    private static final long serialVersionUID = 5747245606837530329L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/await/delete.java b/slice2java/js/test/Slice/escape/await/delete.java
index 8ff71541dfdb..18b03964c1b9 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 = -6889275606381639872L;
+    private static final long serialVersionUID = 3954929306844313860L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/await/fixed.java b/slice2java/js/test/Slice/escape/await/fixed.java
index 0d88b2ffe4dd..95104e7f5dce 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 = 3808658993842636255L;
+    private static final long serialVersionUID = 3808653957108357147L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/foreach.java b/slice2java/js/test/Slice/escape/await/foreach.java
index 98be99dc4bf8..8627fe064b73 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 = 6858459413076849097L;
+    private static final long serialVersionUID = 174508328023817033L;
 }
diff --git a/slice2java/js/test/Slice/macros/Test/Default.java b/slice2java/js/test/Slice/macros/Test/Default.java
index 40c4140cddc8..22563afd9895 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 = -4633875614669044162L;
+    private static final long serialVersionUID = -2496935609101251938L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/macros/Test/NoDefault.java b/slice2java/js/test/Slice/macros/Test/NoDefault.java
index 383aadd5aca3..bb8419230856 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 = 2179691045093759455L;
+    private static final long serialVersionUID = -2395186779708230785L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java
index 6a58739eae15..51f6fb2a2b8a 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 = -1046805573273017261L;
+    private static final long serialVersionUID = 597004344061369988L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java
index b059bfb6ee20..9636a9d986b8 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 = -289230833112461095L;
+    private static final long serialVersionUID = -7721062667051971813L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 288305d1bb35..914a31855af7 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 = 4770914494192436698L;
+    private static final long serialVersionUID = -1410621566973056416L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java
index 6e80a7f3c092..311d51746a44 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 = 4275653936229922349L;
+    private static final long serialVersionUID = -4571818702652834624L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java
index 3f3d12b9f6f7..4a769122b15b 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 = 5127387578605607314L;
+    private static final long serialVersionUID = 5127392156630582686L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java
index c1303bc3770e..12f85b75f84a 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 = 4015815850038212574L;
+    private static final long serialVersionUID = 1668951705845659396L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java
index 9d4f3ddc51c7..f8ae44362f43 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 = -1795076419297215297L;
+    private static final long serialVersionUID = -1823949706895974506L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java
index 983b6f2a6446..55fb795616e3 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 = -3668029108607337637L;
+    private static final long serialVersionUID = 4852493170607984882L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/A.java b/slice2java/matlab/test/Ice/exceptions/Test/A.java
index 793cc0f7ab53..682d14e8b64b 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 = 7823745367346268893L;
+    private static final long serialVersionUID = 7823738602631767092L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/B.java b/slice2java/matlab/test/Ice/exceptions/Test/B.java
index 801fa816f1b3..9bc495a2471a 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 = -3861410696473507427L;
+    private static final long serialVersionUID = -3861417295875787788L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/C.java b/slice2java/matlab/test/Ice/exceptions/Test/C.java
index c377254ec2fb..193a1ebb1f42 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 = 1080699058549054173L;
+    private static final long serialVersionUID = 1080692293834552372L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/D.java b/slice2java/matlab/test/Ice/exceptions/Test/D.java
index a62edb24d8de..1e5c03505df9 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 = 4780381571628570781L;
+    private static final long serialVersionUID = 4780374972226290420L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/E.java b/slice2java/matlab/test/Ice/exceptions/Test/E.java
index 953f76dd84f7..c949ef974441 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 = -1876968131432047782L;
+    private static final long serialVersionUID = -1876980229899897815L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/F.java b/slice2java/matlab/test/Ice/exceptions/Test/F.java
index 103cce6bebd7..46b3599f8901 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 = 733475511020141529L;
+    private static final long serialVersionUID = 733476970226706410L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java
index 73e19b01ef91..b7429ae00591 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 = -4641413459112837303L;
+    private static final long serialVersionUID = -4641409683018795872L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java
index 3d1869363447..b0dd4a530595 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 = -8471303107221848609L;
+    private static final long serialVersionUID = -8471300251720560812L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java
index bf4a22cafe66..99b3f7ecbc7d 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 = 8898649189887689374L;
+    private static final long serialVersionUID = 8898651961366105221L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java
index 47491f0b9e71..a8c0d11d04a9 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 = 4040522920605819985L;
+    private static final long serialVersionUID = 4040525852245296317L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java
index f0778f3270ec..8e81ec825fbc 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 = 5383248447412414268L;
+    private static final long serialVersionUID = 5383251291381904469L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java
index 7f128a96ed90..381b1ba0269d 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 = 4057366833553221312L;
+    private static final long serialVersionUID = 4057363896614850995L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java
index b6b1d411ff15..22be8801347c 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 = -1044053119735496015L;
+    private static final long serialVersionUID = -1044055808558429995L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java
index 6dd2c10935d3..24b8f4ef8019 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 = -1862548377920934120L;
+    private static final long serialVersionUID = -1862551314863854152L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java
index 89338b63051d..9688f12e8201 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 = -2187162105790586294L;
+    private static final long serialVersionUID = -2187164794619974527L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java
index 083d659e84f3..3fa4c4e6708f 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 = 8677895552970953232L;
+    private static final long serialVersionUID = -5741457533201101725L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java
index 887328c153a0..73415eeeebc9 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 = -5145822282418171966L;
+    private static final long serialVersionUID = -5145825047382709124L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java
index e8344de0746c..48011072b07c 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 = 3347992628501544742L;
+    private static final long serialVersionUID = 3347995570453642173L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java
index 9e8fd0083bba..87e6676795b3 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 = -9162147477249647413L;
+    private static final long serialVersionUID = -9162150166074746201L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java
index c0eb8733a5c0..4cf5ed427a92 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 = -2752863584896819520L;
+    private static final long serialVersionUID = -2752860891056400023L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java
index a754ed7d7ffe..93b4c72fdd00 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 = -6601220121523539750L;
+    private static final long serialVersionUID = -6601217437997946071L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java
index c20ed397a510..9c12e851fd16 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 = 3216397007555595209L;
+    private static final long serialVersionUID = 3216394148257782637L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java
index 6d1c79962137..a0e2fa34bfa0 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 = -3218146038085052222L;
+    private static final long serialVersionUID = -3218143354563971102L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java
index bd98eca09785..c1b45e3f238a 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 = 4560075888208213950L;
+    private static final long serialVersionUID = 4560073039227458421L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java
index 1e0e2bfb1fe5..2588b19176ca 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 = 4196844057939623315L;
+    private static final long serialVersionUID = -7982559395684199245L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/A.java b/slice2java/matlab/test/Ice/objects/Test/A.java
index bbe8a561ec99..067789425e21 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 = -872757191588578626L;
+    private static final long serialVersionUID = 6010101966568192027L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/A1.java b/slice2java/matlab/test/Ice/objects/Test/A1.java
index 890180d7b1e3..6e50e628bae7 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 = -5926741830232883283L;
+    private static final long serialVersionUID = -5926741971083728893L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/B.java b/slice2java/matlab/test/Ice/objects/Test/B.java
index 27fcb31061c0..da577ece5896 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 = -8890919816402821877L;
+    private static final long serialVersionUID = -8890919747882841619L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/B1.java b/slice2java/matlab/test/Ice/objects/Test/B1.java
index dc69159be711..8a49cb6ac159 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 = 1613757170671705476L;
+    private static final long serialVersionUID = 3009015643097264900L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Base.java b/slice2java/matlab/test/Ice/objects/Test/Base.java
index edfa579066e8..55edd1d4725c 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 = -6410139568186302602L;
+    private static final long serialVersionUID = -4844115299598166008L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/C.java b/slice2java/matlab/test/Ice/objects/Test/C.java
index 16c15e0ee6c2..94b757d92ccc 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 = -7972531523414675068L;
+    private static final long serialVersionUID = -8516715400523161430L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/COneMember.java b/slice2java/matlab/test/Ice/objects/Test/COneMember.java
index e7f745961457..644518677a57 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 = 3050973212326242954L;
+    private static final long serialVersionUID = 3050974250429677895L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java
index ac93175dec67..104cd9a44172 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 = -5481030031967849829L;
+    private static final long serialVersionUID = 9198493452406445403L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/D.java b/slice2java/matlab/test/Ice/objects/Test/D.java
index ba8ac4b2a8db..cf08675efc84 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 = 852825655288869809L;
+    private static final long serialVersionUID = 8053099549246611826L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/D1.java b/slice2java/matlab/test/Ice/objects/Test/D1.java
index c89c2e951d0b..5d68e2e46ca4 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 = -2183531714196450365L;
+    private static final long serialVersionUID = -1535578056899340477L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/E.java b/slice2java/matlab/test/Ice/objects/Test/E.java
index 11f17c83c94e..66d4ce1ca2d3 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 = -2116714373307219164L;
+    private static final long serialVersionUID = -7902129129935727778L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/EBase.java b/slice2java/matlab/test/Ice/objects/Test/EBase.java
index 0d6ff0ad11c7..905e6b73305f 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 = -5449211363012524466L;
+    private static final long serialVersionUID = -1411368566552725810L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/EDerived.java b/slice2java/matlab/test/Ice/objects/Test/EDerived.java
index 36a062d78783..486d2196d234 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 = 1298288036311182162L;
+    private static final long serialVersionUID = 716929568713311826L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java
index e1e8c834601c..1f0938201f5b 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 = -6225288025046400891L;
+    private static final long serialVersionUID = -6225289393921057720L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java
index 45482f6bf1c6..09dca64db5ef 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 = -3878398746994792684L;
+    private static final long serialVersionUID = 5528096056400077780L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/F.java b/slice2java/matlab/test/Ice/objects/Test/F.java
index e75782cb19d0..040f3c563ce7 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 = -161475599128787503L;
+    private static final long serialVersionUID = 8192116143175161745L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/F1.java b/slice2java/matlab/test/Ice/objects/Test/F1.java
index a102e20d2950..8ed43784e235 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 = 6192373654077625364L;
+    private static final long serialVersionUID = 6192371926099745224L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/F3.java b/slice2java/matlab/test/Ice/objects/Test/F3.java
index bc2810afb88b..3242467eb9d1 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 = 8139611895339048391L;
+    private static final long serialVersionUID = 7349003135186937673L;
 
     /** @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 2a601e4115a2..5d5d5fb6ca29 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 = -1425256822966797279L;
+    private static final long serialVersionUID = -1425256924925045113L;
 
     /** @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 fb0557604915..1f791cec0b4d 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 = -2337227878613900012L;
+    private static final long serialVersionUID = -2337227732454719430L;
 }
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 c73788f465bc..3b926a717c80 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 = -1298680837521569624L;
+    private static final long serialVersionUID = -1298680779372405284L;
 
     /** @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 70a92387a6fe..5cfd3aac9069 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 = 1842234301279206832L;
+    private static final long serialVersionUID = 1842234111362598366L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/K.java b/slice2java/matlab/test/Ice/objects/Test/K.java
index 95d7f1c2e5f5..48587bbab138 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 = 4645162910847176402L;
+    private static final long serialVersionUID = 4645164441193314893L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/L.java b/slice2java/matlab/test/Ice/objects/Test/L.java
index 54afc5854080..e1f47e5d178b 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 = 6629735317029229478L;
+    private static final long serialVersionUID = 6629735263837498824L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/M.java b/slice2java/matlab/test/Ice/objects/Test/M.java
index 2b16c100216b..ad687aa182eb 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 = -8088093109428655410L;
+    private static final long serialVersionUID = -8088100094939873821L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Recursive.java b/slice2java/matlab/test/Ice/objects/Test/Recursive.java
index d8195d3dfe91..7688eb1e4fba 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 = 3617878995939334602L;
+    private static final long serialVersionUID = 3617880526299020895L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/S.java b/slice2java/matlab/test/Ice/objects/Test/S.java
index 73a1a6a104e3..854ce1b19532 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 = 481770695638064405L;
+    private static final long serialVersionUID = 481770598840129659L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java
index bf9a7f12fd66..b1d5251335c5 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 = 6227757477251190419L;
+    private static final long serialVersionUID = 6227750492911539038L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java
index 6cd7ba469a3c..da2d55456bc2 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 = 7988300518864625794L;
+    private static final long serialVersionUID = -769903314880228542L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/StructKey.java b/slice2java/matlab/test/Ice/objects/Test/StructKey.java
index 0d9a8d9f8fec..29822549218a 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 = 6296046578844086376L;
+    private static final long serialVersionUID = 2977478967589168914L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java
index bef7a447e083..a752390f30fc 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 = 2723847530417984704L;
+    private static final long serialVersionUID = 2723844180359273056L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java
index 34bb993f2dfa..eeba95d1b225 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 = 7273811047949162942L;
+    private static final long serialVersionUID = -3380516566354827282L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java
index 6e1b068ebd74..f2b4567fd691 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 = 3550567272162861949L;
+    private static final long serialVersionUID = 5166687156452871645L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java
index 3a134e4ed818..6c86826c5a36 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 = -7757569059625010313L;
+    private static final long serialVersionUID = 3086469911090742951L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/Structure.java b/slice2java/matlab/test/Ice/operations/Test/Structure.java
index 8e721a394823..4e43184e15e5 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 = -6955801579552220040L;
+    private static final long serialVersionUID = -1729961978927105293L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/A.java b/slice2java/matlab/test/Ice/optional/Test/A.java
index c375e360bac1..6753626d4522 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 = 8142046650800311824L;
+    private static final long serialVersionUID = -1687573850031584112L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/B.java b/slice2java/matlab/test/Ice/optional/Test/B.java
index 98299f36b580..1a4c96a1df1d 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 = 7013194722455036451L;
+    private static final long serialVersionUID = 4284833596111898403L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/C.java b/slice2java/matlab/test/Ice/optional/Test/C.java
index 125fd9a0a332..77ede9a80503 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 = 8921437988577283837L;
+    private static final long serialVersionUID = 7174749044944201469L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java
index 40ba5c404c7e..00c1363836dc 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 = 9140408273816988360L;
+    private static final long serialVersionUID = -5430602545503743208L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/E.java b/slice2java/matlab/test/Ice/optional/Test/E.java
index 083648932602..72deb9a08107 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 = -1850734559026737161L;
+    private static final long serialVersionUID = -1850742761215777113L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/F.java b/slice2java/matlab/test/Ice/optional/Test/F.java
index 5a01657e2995..f59e1337e69d 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 = -6430497410847110012L;
+    private static final long serialVersionUID = -6430489208658070060L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java
index 272cfd95b4f9..7ce3d882fedc 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 = 1569602097145959058L;
+    private static final long serialVersionUID = 1569605009487880258L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/G.java b/slice2java/matlab/test/Ice/optional/Test/G.java
index 38f1212a367a..b4be813a702c 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 = 6295146696383985171L;
+    private static final long serialVersionUID = -1837607066003657709L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/G1.java b/slice2java/matlab/test/Ice/optional/Test/G1.java
index a0dfc09afb3b..5adc4bf9a0e6 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 = 7339784210944774470L;
+    private static final long serialVersionUID = 7339781298608707734L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/G2.java b/slice2java/matlab/test/Ice/optional/Test/G2.java
index 733cc91ec0b6..5ea043d85f7b 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 = 3824556054302578656L;
+    private static final long serialVersionUID = 3824547852113710896L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java
index 84141c7ca63b..e45294e21feb 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 = 8241962624742511032L;
+    private static final long serialVersionUID = 7399373261786321512L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java
index e43350bd4067..1a965f7e944d 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 = -7219598655691644228L;
+    private static final long serialVersionUID = -7219601363827523988L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java
index 738ca244072c..72ef98183abf 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 = -3397308447781856807L;
+    private static final long serialVersionUID = -1329877200480237943L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java
index 8401542cfaa8..f8af47f192a1 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 = -6187196504051302277L;
+    private static final long serialVersionUID = -877538739155072901L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java
index 4d606598640c..1e7fd284083b 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 = 2894238154175779343L;
+    private static final long serialVersionUID = 2894235407147334111L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java
index 3fce69d665b2..203d78f384a7 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 = 6700988623043606390L;
+    private static final long serialVersionUID = 6700991370072051622L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java
index 6c70c4377de0..eee82baf06dc 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 = -1912284656638812978L;
+    private static final long serialVersionUID = -1912287568974879714L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/WD.java b/slice2java/matlab/test/Ice/optional/Test/WD.java
index 52af94c541a9..b8841434aaed 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 = 2413554161430111674L;
+    private static final long serialVersionUID = -586164949410638662L;
 
     /** @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 6288c0eb6350..87963dca4abd 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 = -477021093816170722L;
+    private static final long serialVersionUID = -477023718090888879L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java
index 70c38bc1eab8..bf26a3529342 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 = -8435644655262801958L;
+    private static final long serialVersionUID = -8435636524201631211L;
 
     /** @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 db517a7ed2f6..6111aba836cb 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 = 3485211676473797304L;
+    private static final long serialVersionUID = 3485214176895638519L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 4dba8ca12e86..61f8d729f939 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 = 1717375372056544329L;
+    private static final long serialVersionUID = 1717377996312288774L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 7ee9057fa2ec..4d1066f7a964 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 = -7384921143413664368L;
+    private static final long serialVersionUID = -7384918637968123297L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java
index 3994343b4f3f..538f05f74c48 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 = -2733699005001744683L;
+    private static final long serialVersionUID = -2733706931858932582L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
index 100528639014..e248caa1bd6f 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 = 4528104081619381404L;
+    private static final long serialVersionUID = 4528095997018099027L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java
index e6a67d0ec6fc..238993e838a5 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 = 6137366344070336627L;
+    private static final long serialVersionUID = 6137358378250655306L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java
index 797d59af6e15..f2cc743f1691 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 = 751748562481158163L;
+    private static final long serialVersionUID = 751740601670667882L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java
index 66334ce03c9c..e17a46cd7c89 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 = -4272726459687552732L;
+    private static final long serialVersionUID = -4272734588170531221L;
 
     /** @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 9bcf615cabc2..62efc255ba0b 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 = -6837109951361986335L;
+    private static final long serialVersionUID = 5672554228145383919L;
 
     /** @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 960660ff6938..4c66d97e3ec2 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 = 6660701623428403885L;
+    private static final long serialVersionUID = -2113705768338909789L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java
index f88266a2fabd..dbc9e874aeaa 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 = -6397005322190070283L;
+    private static final long serialVersionUID = -6396997945427849226L;
 
     /** @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 7ade0d251091..ca330f58783d 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 = -9066883288495738152L;
+    private static final long serialVersionUID = -9066887940399465015L;
 
     /** @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 e3a402a133d9..04cf90b3f9de 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 = 4829440508520554946L;
+    private static final long serialVersionUID = 6123929148419436972L;
 
     /** @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 cc848ea23544..4850b5c12dbb 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 = 7456655251997020672L;
+    private static final long serialVersionUID = -6183563893036776850L;
 
     /** @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 236019cd9722..71275012f4e7 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 = 8465687623489777842L;
+    private static final long serialVersionUID = 7622250647193529311L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java
index e6a237383d08..903b727fd0a1 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 = -7655926416666980935L;
+    private static final long serialVersionUID = -7655927220055530862L;
 
     /** @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 fca405ab5c5c..0093c03c1c67 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 = -2271125443355030145L;
+    private static final long serialVersionUID = -2271124805398666296L;
 
     /** @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 9bb42151a43e..e33e5975e0f0 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 = 481705572321380139L;
+    private static final long serialVersionUID = 481712948969774055L;
 
     /** @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 d67d746ef207..bd4a41ab1683 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 = -4426884894159420619L;
+    private static final long serialVersionUID = -4426882972562500554L;
 
     /** @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 a9c6e475b951..4b0dd3fccf9a 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 = 850536604529704630L;
+    private static final long serialVersionUID = 850539972742736378L;
 
     /** @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 387a88f7b3a2..e82fc9754972 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 = -4328902097562119649L;
+    private static final long serialVersionUID = -4328908190720927025L;
 
     /** @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 c906206a1b46..8e34821dd6c5 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 = -5081815269376753108L;
+    private static final long serialVersionUID = -5081806446066506433L;
 
     /** @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 62ee0b3b8e2a..85aaf497b2ca 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 = 643077335232237663L;
+    private static final long serialVersionUID = 643086323969252942L;
 
     /** @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 b678a591efa1..4685bfd7f77b 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 = -2438005798132510121L;
+    private static final long serialVersionUID = -2438001146289191184L;
 
     /** @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 4968b9af2b87..136d311f22dc 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 = 3651531990058580773L;
+    private static final long serialVersionUID = 3651532628030552374L;
 
     /** @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 4198c9ee5bae..6c9236675caf 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 = 8804374449478592256L;
+    private static final long serialVersionUID = 8804372527917094291L;
 
     /** @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 a1bec490b815..30b5b3bf4fbf 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 = -5353764773769990346L;
+    private static final long serialVersionUID = -5353754666907996763L;
 
     /** @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 ff3e9c37d230..73472f058b8a 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 = -6522131587266403708L;
+    private static final long serialVersionUID = -6522141694078753055L;
 
     /** @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 11cd1d03345c..dc725b1ecf70 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 = 7620290877065012487L;
+    private static final long serialVersionUID = 7620283500257181986L;
 
     /** @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 c020e55518bf..da70724945c3 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 = 2643281761619295420L;
+    private static final long serialVersionUID = -1366397646923654382L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java
index 7cf03906432d..00dd4a31b628 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 = 693024374199943725L;
+    private static final long serialVersionUID = -3144641104866646419L;
 
     /** @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 7150fc64d62e..35555c0278f7 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 = -5328180156232309912L;
+    private static final long serialVersionUID = -8681491568003243730L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java
index d66f61ba5b96..fedb85b10b0e 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 = 2421492898103416174L;
+    private static final long serialVersionUID = 2421490937576945816L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java
index 0771382b70fc..bd40da7233ad 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 = 7726043977575006684L;
+    private static final long serialVersionUID = 7046193768704998018L;
 
     /** @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 b1954b8adc4d..49e1fe470d18 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 = 7326981352589418618L;
+    private static final long serialVersionUID = 3518832480071477407L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java
index 8d884b0ba091..d1d147bd7014 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 = 976546188795156988L;
+    private static final long serialVersionUID = -4065942982647931721L;
 
     /** @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 78686651f8a7..15cbb8475310 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 = -1008947233177996081L;
+    private static final long serialVersionUID = -1008941096043970503L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Base.java b/slice2java/php/test/Ice/defaultValue/Test/Base.java
index 1fb0be38a7cc..5e94cb99ccb5 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/Base.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/Base.java
@@ -106,7 +106,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3961519392130091107L;
+    private static final long serialVersionUID = 4637049894888984029L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 9b9ed60d90c5..1905be5b8cf3 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java
@@ -51,7 +51,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3595540354316275139L;
+    private static final long serialVersionUID = 8449669433374540043L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index a3e6175bf40a..c50efc05a1b1 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
@@ -53,7 +53,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5372926133803600418L;
+    private static final long serialVersionUID = 5308195259205668249L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Derived.java b/slice2java/php/test/Ice/defaultValue/Test/Derived.java
index 7a65fd967d75..427ea7fb0f92 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/Derived.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/Derived.java
@@ -68,7 +68,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4642022248632586625L;
+    private static final long serialVersionUID = 5082361139442265791L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java
index 57f13b9063d3..fd13f688bbea 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java
@@ -138,5 +138,5 @@ static public java.util.Optional<InnerStruct> ice_read(com.zeroc.Ice.InputStream
     private static final InnerStruct _nullMarshalValue = new InnerStruct();
 
     /** @hidden */
-    private static final long serialVersionUID = 5127394788650063138L;
+    private static final long serialVersionUID = 5127385324919984320L;
 }
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java
index e73cb38c6445..2072aded0298 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java
@@ -395,5 +395,5 @@ static public java.util.Optional<Struct1> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct1 _nullMarshalValue = new Struct1();
 
     /** @hidden */
-    private static final long serialVersionUID = 2548311604529473058L;
+    private static final long serialVersionUID = 8247467500096967394L;
 }
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java
index 36a3745426f9..94b49ec24b4c 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java
@@ -370,5 +370,5 @@ static public java.util.Optional<Struct2> ice_read(com.zeroc.Ice.InputStream ist
     private static final Struct2 _nullMarshalValue = new Struct2();
 
     /** @hidden */
-    private static final long serialVersionUID = -807862174296692534L;
+    private static final long serialVersionUID = -7968655878549572918L;
 }
diff --git a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java
index 6753dc5d86b2..afbfc3a4cf92 100644
--- a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java
+++ b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java
@@ -274,5 +274,5 @@ static public java.util.Optional<StructNoDefaults> ice_read(com.zeroc.Ice.InputS
     private static final StructNoDefaults _nullMarshalValue = new StructNoDefaults();
 
     /** @hidden */
-    private static final long serialVersionUID = -2455365752796596109L;
+    private static final long serialVersionUID = -6026344039056346754L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/A.java b/slice2java/php/test/Ice/exceptions/Test/A.java
index 5c6719b38f70..650f4e6a97a7 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 = 7823744499332152346L;
+    private static final long serialVersionUID = 7823746689809519494L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/B.java b/slice2java/php/test/Ice/exceptions/Test/B.java
index 948db85bdf0c..cc6137cfc8d3 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 = -3861405944023761958L;
+    private static final long serialVersionUID = -3861409374010395962L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/C.java b/slice2java/php/test/Ice/exceptions/Test/C.java
index b662c5bfd4de..403665151742 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 = 1080698190534937626L;
+    private static final long serialVersionUID = 1080700381012304774L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/D.java b/slice2java/php/test/Ice/exceptions/Test/D.java
index 5706e4240a8c..f0209fbadd32 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 = 4780386324078316250L;
+    private static final long serialVersionUID = 4780382894091682246L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/Thrower.java b/slice2java/php/test/Ice/exceptions/Test/Thrower.java
index 39167db50373..3cb9229246a2 100644
--- a/slice2java/php/test/Ice/exceptions/Test/Thrower.java
+++ b/slice2java/php/test/Ice/exceptions/Test/Thrower.java
@@ -25,8 +25,8 @@ void throwAasA(int a, com.zeroc.Ice.Current current)
         throws A;
 
     void throwAorDasAorD(int a, com.zeroc.Ice.Current current)
-        throws D,
-               A;
+        throws A,
+               D;
 
     void throwBasA(int a, int b, com.zeroc.Ice.Current current)
         throws A;
diff --git a/slice2java/php/test/Ice/exceptions/Test/ThrowerPrx.java b/slice2java/php/test/Ice/exceptions/Test/ThrowerPrx.java
index 46db1bf5ac49..2d05231f46f8 100644
--- a/slice2java/php/test/Ice/exceptions/Test/ThrowerPrx.java
+++ b/slice2java/php/test/Ice/exceptions/Test/ThrowerPrx.java
@@ -143,25 +143,25 @@ default com.zeroc.Ice.OutgoingAsync<Void> _iceI_throwAasAAsync(int iceP_a, java.
     };
 
     default void throwAorDasAorD(int a)
-        throws D,
-               A
+        throws A,
+               D
     {
         throwAorDasAorD(a, com.zeroc.Ice.ObjectPrx.noExplicitContext);
     }
 
     default void throwAorDasAorD(int a, java.util.Map<String, String> context)
-        throws D,
-               A
+        throws A,
+               D
     {
         try
         {
             _iceI_throwAorDasAorDAsync(a, context, true).waitForResponseOrUserEx();
         }
-        catch(D ex)
+        catch(A ex)
         {
             throw ex;
         }
-        catch(A ex)
+        catch(D ex)
         {
             throw ex;
         }
@@ -200,8 +200,8 @@ default com.zeroc.Ice.OutgoingAsync<Void> _iceI_throwAorDasAorDAsync(int iceP_a,
     /** @hidden */
     static final Class<?>[] _iceE_throwAorDasAorD =
     {
-        D.class,
-        A.class
+        A.class,
+        D.class
     };
 
     default void throwBasA(int a, int b)
diff --git a/slice2java/php/test/Ice/objects/Test/A.java b/slice2java/php/test/Ice/objects/Test/A.java
index 2aa39219fb8e..7256ca27f44f 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 = -536293083403811177L;
+    private static final long serialVersionUID = 9185215662818159899L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/A1.java b/slice2java/php/test/Ice/objects/Test/A1.java
index 341af11b04a0..16801fc85028 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 = -5926752256339481216L;
+    private static final long serialVersionUID = -5926738905129714739L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/B.java b/slice2java/php/test/Ice/objects/Test/B.java
index 400e87aa2bbe..5d2885dd0736 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 = -8890917975984078290L;
+    private static final long serialVersionUID = -8890911913824049629L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/B1.java b/slice2java/php/test/Ice/objects/Test/B1.java
index 8bd425f6e321..9958da96b8ad 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 = -3795710900386753148L;
+    private static final long serialVersionUID = -7471059741493655932L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/Base.java b/slice2java/php/test/Ice/objects/Test/Base.java
index 57f7e84e5fea..f3df13f1ef09 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 = -2875395650193458200L;
+    private static final long serialVersionUID = 1748112093015944462L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/C.java b/slice2java/php/test/Ice/objects/Test/C.java
index f6634472de17..bf37734c8646 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 = -6158251306590205493L;
+    private static final long serialVersionUID = 7316819242904971428L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/COneMember.java b/slice2java/php/test/Ice/objects/Test/COneMember.java
index c549a83008ce..16713700fa4b 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 = 3050969738161946786L;
+    private static final long serialVersionUID = 3050965149436245194L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java
index e57c5f92c8c2..2895c7c155d5 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 = 7395268330913449883L;
+    private static final long serialVersionUID = -4542728510148452325L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/D.java b/slice2java/php/test/Ice/objects/Test/D.java
index 4cf385de5807..63c799b7801d 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 = -6790755237373828195L;
+    private static final long serialVersionUID = 8536248653341853564L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/D1.java b/slice2java/php/test/Ice/objects/Test/D1.java
index d10f8ae3191f..a998bc0c02f3 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 = -6745507718257230141L;
+    private static final long serialVersionUID = 8894997672765373891L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/E.java b/slice2java/php/test/Ice/objects/Test/E.java
index d67c7be4bd20..b3ad65c781bc 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 = 474196403062946178L;
+    private static final long serialVersionUID = -6012922584515811298L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/EBase.java b/slice2java/php/test/Ice/objects/Test/EBase.java
index c8ccd0a28053..8d0722d0eae2 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 = 2299265027830990414L;
+    private static final long serialVersionUID = 4955343372360047438L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/EDerived.java b/slice2java/php/test/Ice/objects/Test/EDerived.java
index fbedfffa98eb..c9866897ab3d 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 = -3816954856164714798L;
+    private static final long serialVersionUID = -34759056852060718L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/EOneMember.java b/slice2java/php/test/Ice/objects/Test/EOneMember.java
index fb8cbd774826..533eba9d786a 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 = -6225291493965982611L;
+    private static final long serialVersionUID = -6225280331784538939L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java
index fbbc56e10de1..12bb44857a76 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 = 1572035238551908884L;
+    private static final long serialVersionUID = 4438317472427022740L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/F.java b/slice2java/php/test/Ice/objects/Test/F.java
index 72d487463e59..683dd61201e2 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 = -7941470110857965231L;
+    private static final long serialVersionUID = -6428664061558160751L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/F1.java b/slice2java/php/test/Ice/objects/Test/F1.java
index 9889322b49c1..63d865270d5d 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 = 6192365847072787714L;
+    private static final long serialVersionUID = 6192366030472941194L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/F3.java b/slice2java/php/test/Ice/objects/Test/F3.java
index 4746cf5020a2..b2863df12f2d 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 = 5042420689111419203L;
+    private static final long serialVersionUID = 7175166765108063123L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/K.java b/slice2java/php/test/Ice/objects/Test/K.java
index 4f059793ebc0..b000e4132097 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 = 4645161105472389540L;
+    private static final long serialVersionUID = 4645160827883409704L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/L.java b/slice2java/php/test/Ice/objects/Test/L.java
index 89b69bc4ba0b..eed00f0ea44a 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 = 6629744061473948747L;
+    private static final long serialVersionUID = 6629743097891542790L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/Recursive.java b/slice2java/php/test/Ice/objects/Test/Recursive.java
index e48907916794..32690939ab8a 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 = 3617876870275776188L;
+    private static final long serialVersionUID = 3617887141408534133L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/S.java b/slice2java/php/test/Ice/objects/Test/S.java
index 686a195bf175..6f1e1ae4f5e9 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 = 481772541212447224L;
+    private static final long serialVersionUID = 481772982899056949L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/SOneMember.java b/slice2java/php/test/Ice/objects/Test/SOneMember.java
index de8deea1e84a..a2bf2ae959a4 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 = 6227760780632965883L;
+    private static final long serialVersionUID = 6227748683587760083L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/STwoMembers.java b/slice2java/php/test/Ice/objects/Test/STwoMembers.java
index 784ee2891f39..cfeef69bb7b0 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 = -931043922780928894L;
+    private static final long serialVersionUID = -9000860826916598014L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java
index 7715dd415332..380626d3b618 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 = 2723846690804835841L;
+    private static final long serialVersionUID = 2723844849322705600L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/MyClass1.java b/slice2java/php/test/Ice/operations/Test/MyClass1.java
index 8c92cb9ef75c..86b4f58d45ac 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 = 2211513928634320782L;
+    private static final long serialVersionUID = -8942001026654428881L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/operations/Test/MyStruct1.java b/slice2java/php/test/Ice/operations/Test/MyStruct1.java
index 1fc22f3b7da4..3940749e9ce3 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 = -4421933183712109977L;
+    private static final long serialVersionUID = 2783973370981422022L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/Structure.java b/slice2java/php/test/Ice/operations/Test/Structure.java
index 6400677b0d12..44babac2b24c 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 = -4456877502679961208L;
+    private static final long serialVersionUID = -3316868076910541300L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/A.java b/slice2java/php/test/Ice/optional/Test/A.java
index 7870af9ecb5f..76a0779bbc05 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 = -3540202200793560048L;
+    private static final long serialVersionUID = -1402388208414112880L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/B.java b/slice2java/php/test/Ice/optional/Test/B.java
index 5aac84ac0a3d..4a9b149b0a64 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 = 6833860342931876579L;
+    private static final long serialVersionUID = -2684442730429452445L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/C.java b/slice2java/php/test/Ice/optional/Test/C.java
index 45a317088488..056710b07f99 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 = 2744303941254193917L;
+    private static final long serialVersionUID = 971077772656166909L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/DerivedException.java b/slice2java/php/test/Ice/optional/Test/DerivedException.java
index 1143d7ae180b..ad8b06e7029d 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 = 6486379193782402752L;
+    private static final long serialVersionUID = 6309348879617523061L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/E.java b/slice2java/php/test/Ice/optional/Test/E.java
index aa50d6161432..efe2d9e0f9d5 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 = -1850739245844231427L;
+    private static final long serialVersionUID = -1850731268580717955L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/F.java b/slice2java/php/test/Ice/optional/Test/F.java
index a90aa070267d..8370fadb5194 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 = -6430492719020547826L;
+    private static final long serialVersionUID = -6430490106259966450L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/FixedStruct.java b/slice2java/php/test/Ice/optional/Test/FixedStruct.java
index d28d770ed2ae..05940f3541d3 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 = 1569601411460398995L;
+    private static final long serialVersionUID = 1569609554248605821L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/G.java b/slice2java/php/test/Ice/optional/Test/G.java
index 7904fe655315..22edd6742d0c 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 = -2523968318798704109L;
+    private static final long serialVersionUID = 4294104215399911187L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/G1.java b/slice2java/php/test/Ice/optional/Test/G1.java
index ee7648b7d92c..7f62557cde06 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 = 7339784731174126414L;
+    private static final long serialVersionUID = 7339787343820391163L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/G2.java b/slice2java/php/test/Ice/optional/Test/G2.java
index 4bcd8fed98bf..ed7c0594ef8f 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 = 3824551367489383056L;
+    private static final long serialVersionUID = 3824559344763216537L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/MultiOptional.java b/slice2java/php/test/Ice/optional/Test/MultiOptional.java
index 5104a65b8fe5..205acbb5b862 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 = -6939528396144036624L;
+    private static final long serialVersionUID = 1406485314869373990L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/OneOptional.java b/slice2java/php/test/Ice/optional/Test/OneOptional.java
index 1157e0c3f49c..f91e849f6e7f 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 = -7219599170918208067L;
+    private static final long serialVersionUID = -7219607398938698605L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/OptionalException.java b/slice2java/php/test/Ice/optional/Test/OptionalException.java
index cae69dfeede8..82ee19a3d4bc 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 = -4535062488317583818L;
+    private static final long serialVersionUID = 8133105762769140249L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java
index 8865c246ba13..ebd5abe31264 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 = -7348617142427922117L;
+    private static final long serialVersionUID = -3481509620323683461L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/RequiredException.java b/slice2java/php/test/Ice/optional/Test/RequiredException.java
index 7a186335d0ef..2783ab2cb758 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 = 2894238752053707271L;
+    private static final long serialVersionUID = 2894241279619488370L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/SmallStruct.java b/slice2java/php/test/Ice/optional/Test/SmallStruct.java
index b5e6a4001c76..f14ef9861880 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 = 6700987859710369084L;
+    private static final long serialVersionUID = 6700996087629226057L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/VarStruct.java b/slice2java/php/test/Ice/optional/Test/VarStruct.java
index e44aaf72a457..4b61698dec01 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 = -1912284136410035002L;
+    private static final long serialVersionUID = -1912281523763770253L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/WD.java b/slice2java/php/test/Ice/optional/Test/WD.java
index f71eb0cc9f7f..29986c106920 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 = -6602162416990633005L;
+    private static final long serialVersionUID = -3193646732500377272L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C.java b/slice2java/php/test/Ice/scope/Test/C.java
index 10eb0a1b8835..2bf65c639902 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 = -5190248392232372328L;
+    private static final long serialVersionUID = -5190250115205846540L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C1.java b/slice2java/php/test/Ice/scope/Test/C1.java
index 8c40d9e963d3..7af392dd41ec 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 = 8893234811227440601L;
+    private static final long serialVersionUID = 8893230402163987884L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C2.java b/slice2java/php/test/Ice/scope/Test/C2.java
index eeb0ed69a8ef..f08567088884 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 = -738570842734610662L;
+    private static final long serialVersionUID = 7825629324682066036L;
 
     /** @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 99e523dc7243..4bb295af5974 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 = 4615626687203588805L;
+    private static final long serialVersionUID = 4615625679939520906L;
 
     /** @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 766f684a54ea..515228ba186a 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 = 672593212622243625L;
+    private static final long serialVersionUID = 672580778452448182L;
 
     /** @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 ea1b9bf8bbf0..e3dfd36d2e45 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 = 8654437823473647860L;
+    private static final long serialVersionUID = 8654442067083570503L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/Inner/S.java b/slice2java/php/test/Ice/scope/Test/Inner/S.java
index 75e592b2d50e..f7baeaa677cd 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 = 3694620487057992376L;
+    private static final long serialVersionUID = 3694613303773839499L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S.java b/slice2java/php/test/Ice/scope/Test/S.java
index b8d87d9c11ec..aea16f7d65f3 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 = 2159700962813085190L;
+    private static final long serialVersionUID = 2159705415936321397L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S1.java b/slice2java/php/test/Ice/scope/Test/S1.java
index a3df5d65d1e4..225b77f69469 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 = 1241678413624483808L;
+    private static final long serialVersionUID = 1241672082835553685L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S2.java b/slice2java/php/test/Ice/scope/Test/S2.java
index f5b4218c7977..54c66848d072 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 = 6468810076106788067L;
+    private static final long serialVersionUID = -8818439402915815155L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java
index 93ee39769a4d..641324f98e78 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 = -477016855227195257L;
+    private static final long serialVersionUID = -477021235881935671L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java
index b83220b9dfe7..081484d6ad7b 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 = 3485210454902084897L;
+    private static final long serialVersionUID = 3485211694706741359L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 36417c1cc62b..3c7259535aa0 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 = 1717371133467552464L;
+    private static final long serialVersionUID = 1717375514122309278L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 28a2faa62898..2c9dcf87fd8f 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 = -7384916904819933175L;
+    private static final long serialVersionUID = -7384921120175994169L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/B.java b/slice2java/php/test/Ice/slicing/objects/Test/B.java
index 19dedf813cac..47af7f9f430d 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 = -8482810052294624359L;
+    private static final long serialVersionUID = 3531674601717165545L;
 
     /** @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 59656685cac1..a9384936db59 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 = 3216654372580199381L;
+    private static final long serialVersionUID = -8797830281431688795L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 468c4460add7..b9660b8bd0f9 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 = -6397001792786095701L;
+    private static final long serialVersionUID = -6397001998208902265L;
 
     /** @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 c31cd51b03e7..8eba9841dd52 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 = -9066887981880087153L;
+    private static final long serialVersionUID = -9066887981880082805L;
 
     /** @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 9e9c74b6f813..866418ce852b 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 = 4245901637311943194L;
+    private static final long serialVersionUID = 8215030561609876138L;
 
     /** @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 04dca76fb29a..78d32bc8447f 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 = 2491597035050909009L;
+    private static final long serialVersionUID = 187970620180820449L;
 
     /** @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 487a3f81e913..520d1abcf7be 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 = 5430110468380814958L;
+    private static final long serialVersionUID = 1460981544089175210L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java
index a59b1c522b68..231c6e42c09b 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 = -7655927133496240431L;
+    private static final long serialVersionUID = -7655927013324824909L;
 
     /** @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 f4eb34b5c75c..f6cb1a2230db 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 = -2271124846421785320L;
+    private static final long serialVersionUID = -2271124846421982420L;
 
     /** @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 f5dc565f9f65..a38c403d047d 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 = 481712907745612104L;
+    private static final long serialVersionUID = 481712907745587196L;
 
     /** @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 ebcbfeb9f1ef..5d7f6c76a9df 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 = -4426886819612551061L;
+    private static final long serialVersionUID = -4426887025044557497L;
 
     /** @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 3da1190becb6..11de90c575d8 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 = 850538530298630450L;
+    private static final long serialVersionUID = 850538409958552662L;
 
     /** @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 a422ebbd485f..5a7cd6e76da4 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 = -4328898888514038155L;
+    private static final long serialVersionUID = -4328898683095565295L;
 
     /** @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 7de8230d022d..a3e139b1674d 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 = -5081818478598560541L;
+    private static final long serialVersionUID = -5081818598784194303L;
 
     /** @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 9a57ddeffc08..13f46afca979 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 = 643086200138629384L;
+    private static final long serialVersionUID = 643086200138625036L;
 
     /** @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 f1060c6efed5..c3d379b604ef 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 = -2438000939860216764L;
+    private static final long serialVersionUID = -2438000939860212416L;
 
     /** @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 0aab6491fe83..cd67b3cacffe 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 = 3651532586875560574L;
+    private static final long serialVersionUID = 3651532586875564922L;
 
     /** @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 0488aa952458..818ceb581e1b 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 = 8804372403947503195L;
+    private static final long serialVersionUID = 8804372403947498847L;
 
     /** @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 51eab769765e..94097d685d99 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 = -5353754460265551379L;
+    private static final long serialVersionUID = -5353754460265547031L;
 
     /** @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 0250151deca2..8f7679b9cb52 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 = -6522141735500923640L;
+    private static final long serialVersionUID = -6522141735500986029L;
 
     /** @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 86a04d79abcb..e6e14b550da0 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 = 7620283376178689675L;
+    private static final long serialVersionUID = 7620283376178629328L;
 
     /** @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 280db1fcf531..21138955ee00 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 = -3187557772129647334L;
+    private static final long serialVersionUID = 6828821151905618962L;
 }
diff --git a/slice2java/php/test/Slice/escape/Clash/Cls.java b/slice2java/php/test/Slice/escape/Clash/Cls.java
index 3399c006cfbf..b251844746e7 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 = -3583974080559967099L;
+    private static final long serialVersionUID = -7421881815770771436L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/escape/Clash/Ex.java b/slice2java/php/test/Slice/escape/Clash/Ex.java
index 165be3566301..ac60a0ac4892 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 = -667711089824830443L;
+    private static final long serialVersionUID = 4839455696386271959L;
 }
diff --git a/slice2java/php/test/Slice/escape/Clash/St.java b/slice2java/php/test/Slice/escape/Clash/St.java
index 5fb0d07ee171..866bfb1c89c5 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 = 9088351900318436944L;
+    private static final long serialVersionUID = 1789228422896569782L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/echo.java b/slice2java/php/test/Slice/escape/and/echo.java
index 8994b33bb5fb..107bc8daf804 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 = 3492936984527209623L;
+    private static final long serialVersionUID = -6252317546203381389L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/escape/and/endif.java b/slice2java/php/test/Slice/escape/and/endif.java
index 7dd018dfe606..845145877014 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 = -3766558847428271587L;
+    private static final long serialVersionUID = -3766557872296074098L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/endwhile.java b/slice2java/php/test/Slice/escape/and/endwhile.java
index 7ac04a8f58d8..ec8340cc5081 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 = 93145205767773166L;
+    private static final long serialVersionUID = 7818167088103122734L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/xor.java b/slice2java/php/test/Slice/escape/and/xor.java
index daed195aac89..1bd9348328a5 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 = 6291529862143775838L;
+    private static final long serialVersionUID = -83192014768972819L;
 }
diff --git a/slice2java/php/test/Slice/macros/Test/Default.java b/slice2java/php/test/Slice/macros/Test/Default.java
index 2cdd19c4e713..2589f600876c 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 = -3960158719184768578L;
+    private static final long serialVersionUID = -4226855240169748642L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/macros/Test/NoDefault.java b/slice2java/php/test/Slice/macros/Test/NoDefault.java
index aa9f1c226410..4a0e9833b320 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 = -2276408021927435553L;
+    private static final long serialVersionUID = -4856241098938943169L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/structure/Test/C.java b/slice2java/php/test/Slice/structure/Test/C.java
index d13b2b2029cf..e69934cc7b3b 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 = -3172282794923736378L;
+    private static final long serialVersionUID = -3172276734128240913L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/structure/Test/S1.java b/slice2java/php/test/Slice/structure/Test/S1.java
index 6fc27e25307d..323969ed3c41 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 = -5542853855361723672L;
+    private static final long serialVersionUID = -5542864170384260851L;
 }
diff --git a/slice2java/php/test/Slice/structure/Test/S2.java b/slice2java/php/test/Slice/structure/Test/S2.java
index 7c215150860d..132944f51d9e 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 = -2205458933676329726L;
+    private static final long serialVersionUID = 4958043491160223113L;
 }
diff --git a/slice2java/python/test/Glacier2/router/Test/CallbackException.java b/slice2java/python/test/Glacier2/router/Test/CallbackException.java
index 8d65fbaf6a24..1084e62d2081 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 = -6001531100429433486L;
+    private static final long serialVersionUID = 7528891733907987310L;
 }
diff --git a/slice2java/python/test/Ice/custom/Test/C.java b/slice2java/python/test/Ice/custom/Test/C.java
index f9230b52ccaf..a410f5151595 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 = 3779773022464171991L;
+    private static final long serialVersionUID = -1634656012209980905L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/custom/Test/D.java b/slice2java/python/test/Ice/custom/Test/D.java
index 01f1c88ca731..5126ef54eae3 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 = -3056213832266032803L;
+    private static final long serialVersionUID = -9053314215682915794L;
 
     /** @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 c474d6eacc8b..9b253500030b 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 = -6757657811140719126L;
+    private static final long serialVersionUID = 7752007911559300325L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/custom/Test/S.java b/slice2java/python/test/Ice/custom/Test/S.java
index 6b3c6568a994..d70a61b791de 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 = 5413059196420549358L;
+    private static final long serialVersionUID = -298525012374881362L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Base.java b/slice2java/python/test/Ice/defaultValue/Test/Base.java
index 576105a7851e..16756d52934a 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 = 7692010254932580751L;
+    private static final long serialVersionUID = 5122175869306361587L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java
index bec2f33758b2..f4b3bead5c11 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 = 2074233789803343291L;
+    private static final long serialVersionUID = 670334056599744007L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 216f0cdcd92b..00702eb85be1 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 = 4521065139690293760L;
+    private static final long serialVersionUID = -3879280985906838757L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index bc7571a8b9ea..f316d8c7454d 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 = -8722404216321063333L;
+    private static final long serialVersionUID = 5695900823173459013L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Derived.java b/slice2java/python/test/Ice/defaultValue/Test/Derived.java
index 94945048904b..434ef0dc9ac9 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 = 4620959739255315520L;
+    private static final long serialVersionUID = -693859275936475795L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java
index 6365755c02bc..b3ce9f1548df 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 = -8116097228595264265L;
+    private static final long serialVersionUID = 8014829190953494234L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index d0ad5cd10263..52767b3069d3 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 = -3938164270980743196L;
+    private static final long serialVersionUID = 5883774856386479103L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index da3db7761e6d..1e761e6d0085 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 = 6051393808370562411L;
+    private static final long serialVersionUID = -5325474072929596811L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java
index 83bd1f91a977..d2533a1e0b35 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 = 5127394733177397394L;
+    private static final long serialVersionUID = 5127385333871735361L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java
index d7ea984dca21..a7b561a3dca6 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 = -4197263636633825745L;
+    private static final long serialVersionUID = 5002394815903925598L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java
index 23506134adfa..d447ad2cd384 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 = 6583231443420682512L;
+    private static final long serialVersionUID = -3948168538980963169L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java
index e1a6b525d48a..ea4e7d95c1bb 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 = 2898195499188231193L;
+    private static final long serialVersionUID = 5414428563350868297L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/A.java b/slice2java/python/test/Ice/exceptions/Test/A.java
index b44ba928b7d7..1ff1504d9770 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 = 7823744680191920451L;
+    private static final long serialVersionUID = 7823744440132222354L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/B.java b/slice2java/python/test/Ice/exceptions/Test/B.java
index 1685aa5b8a52..67c07228c3d5 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 = -3861405928315496317L;
+    private static final long serialVersionUID = -3861405838067589806L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/C.java b/slice2java/python/test/Ice/exceptions/Test/C.java
index db0caa197aa9..be3873fb263b 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 = 1080698371394705731L;
+    private static final long serialVersionUID = 1080698131335007634L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/D.java b/slice2java/python/test/Ice/exceptions/Test/D.java
index e89b5ea0148c..832e96f949a2 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 = 4780386339786581891L;
+    private static final long serialVersionUID = 4780386430034488402L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java
index a1113c9aa3e2..98fad13d6b57 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 = -4641415827884443689L;
+    private static final long serialVersionUID = -4641415747658715642L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/A.java b/slice2java/python/test/Ice/objects/Test/A.java
index c4065b2fd062..6730d83c8563 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 = 3356545340343519678L;
+    private static final long serialVersionUID = -18690135814774053L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/A1.java b/slice2java/python/test/Ice/objects/Test/A1.java
index 4158df13d5b8..5446186eb671 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 = -5926741950422549432L;
+    private static final long serialVersionUID = -5926743233985302478L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/B.java b/slice2java/python/test/Ice/objects/Test/B.java
index d961232da47b..edfe983dea60 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 = -8890919936442650450L;
+    private static final long serialVersionUID = -8890910635437660900L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/B1.java b/slice2java/python/test/Ice/objects/Test/B1.java
index 78ee6ef983b1..6e0e851fbfb6 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 = 7689844253013861956L;
+    private static final long serialVersionUID = -8678895864453630268L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Base.java b/slice2java/python/test/Ice/objects/Test/Base.java
index 18aeb5b49ae0..942bc13f856a 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 = -2494324888126174954L;
+    private static final long serialVersionUID = -8572577591406321880L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/C.java b/slice2java/python/test/Ice/objects/Test/C.java
index 3558fd4cf175..66c7edc99d0b 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 = 5056039089615275073L;
+    private static final long serialVersionUID = -6703850579647535493L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/COneMember.java b/slice2java/python/test/Ice/objects/Test/COneMember.java
index f6dcfd7cb0ca..ae26a3130e30 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 = 3050973152681851973L;
+    private static final long serialVersionUID = 3050969098702616552L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java
index eaf39271b770..da29631248fe 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 = 2944822958266431963L;
+    private static final long serialVersionUID = 4132996916675097115L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/D.java b/slice2java/python/test/Ice/objects/Test/D.java
index 2b2a0b1afafe..ffe10105cc4d 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 = 3284667942757685684L;
+    private static final long serialVersionUID = -4101233702973636253L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/D1.java b/slice2java/python/test/Ice/objects/Test/D1.java
index f5dd4d88f919..b7fe4ae4a33b 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 = 471358797795003651L;
+    private static final long serialVersionUID = 1807354994373585667L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/E.java b/slice2java/python/test/Ice/objects/Test/E.java
index b3c8eace7cf7..955bcbcab501 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 = -6356780040405028476L;
+    private static final long serialVersionUID = 5675039677518303678L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/EBase.java b/slice2java/python/test/Ice/objects/Test/EBase.java
index 6e461b563460..cccb72c613de 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 = -3620627218229994994L;
+    private static final long serialVersionUID = -264359205090772594L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/EDerived.java b/slice2java/python/test/Ice/objects/Test/EDerived.java
index 249869cd4819..5cc22797ff10 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 = 7766458688270828818L;
+    private static final long serialVersionUID = -5090233579640122606L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/EOneMember.java b/slice2java/python/test/Ice/objects/Test/EOneMember.java
index c8bbf95a0fd5..5e67e0a3f2db 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 = -6225288335071545142L;
+    private static final long serialVersionUID = -6225284281086594777L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java
index 2b7b914b2a2b..58fe8f55febd 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 = -3501497909444140972L;
+    private static final long serialVersionUID = -4485626442177549676L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/F.java b/slice2java/python/test/Ice/objects/Test/F.java
index 89ff5399ba25..1d3a0615be55 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 = -3880688355870943407L;
+    private static final long serialVersionUID = -7081328274340357039L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/F1.java b/slice2java/python/test/Ice/objects/Test/F1.java
index b4963e6903e5..bd3f2d7f7c5e 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 = 6192372743672086030L;
+    private static final long serialVersionUID = 6192369415493438431L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/F3.java b/slice2java/python/test/Ice/objects/Test/F3.java
index 9e0db0cd2e73..b9f3f118879d 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 = 489459858099124483L;
+    private static final long serialVersionUID = 4849048845526580021L;
 
     /** @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 6f794caeaa43..ea85805302db 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 = -1425256943158423612L;
+    private static final long serialVersionUID = -1425258226725907786L;
 
     /** @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 7224b9890949..005553922f5b 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 = -2337227748111725967L;
+    private static final long serialVersionUID = -2337226469553145845L;
 }
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 869ee62406de..fd64aad5d6d9 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 = -1298680637267275048L;
+    private static final long serialVersionUID = -1298687371285574091L;
 
     /** @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 3c9566061bda..d3f7b63062d4 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 = 1842234421317075221L;
+    private static final long serialVersionUID = 1842230249870929327L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/K.java b/slice2java/python/test/Ice/objects/Test/K.java
index f70c423384c8..c5c2bf0fa502 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 = 4645163361417957733L;
+    private static final long serialVersionUID = 4645159184966928566L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/L.java b/slice2java/python/test/Ice/objects/Test/L.java
index 010bed2ef31a..43ca80918b93 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 = 6629735116764084227L;
+    private static final long serialVersionUID = 6629747310800209337L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/M.java b/slice2java/python/test/Ice/objects/Test/M.java
index 02627cdaf384..2649b8657c42 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 = -8088093239712890067L;
+    private static final long serialVersionUID = -8088105433751482212L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Recursive.java b/slice2java/python/test/Ice/objects/Test/Recursive.java
index c4a3a5f714a5..0b1ab390526f 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 = 3617879126223435261L;
+    private static final long serialVersionUID = 3617885860091989892L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/S.java b/slice2java/python/test/Ice/objects/Test/S.java
index 98a1c7ed1e7e..818f1beda979 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 = 481770575600196016L;
+    private static final long serialVersionUID = 481774421435821962L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/SOneMember.java b/slice2java/python/test/Ice/objects/Test/SOneMember.java
index e1026ae8b075..531390db0d46 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 = 6227757371269854812L;
+    private static final long serialVersionUID = 6227745214752360497L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/STwoMembers.java b/slice2java/python/test/Ice/objects/Test/STwoMembers.java
index 5366721e3a58..3e87d668a1c4 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 = 5310521960930153666L;
+    private static final long serialVersionUID = -6239182646062849534L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/StructKey.java b/slice2java/python/test/Ice/objects/Test/StructKey.java
index 2c56394e0b95..29c8cdb5606d 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 = 5811076022624581320L;
+    private static final long serialVersionUID = 276644605308704370L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java
index f474cea86ae0..752258555cdb 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 = 2723849592830067176L;
+    private static final long serialVersionUID = 2723850418149723280L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/MyClass1.java b/slice2java/python/test/Ice/operations/Test/MyClass1.java
index 0d6b99f8ce6e..5757379ea939 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 = -2235647589888479223L;
+    private static final long serialVersionUID = 1107301234580746088L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct.java b/slice2java/python/test/Ice/operations/Test/MyStruct.java
index a5b44c49ec3e..f3b6c7a06ef5 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 = 2624082347816422813L;
+    private static final long serialVersionUID = -1666350177312995267L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct1.java b/slice2java/python/test/Ice/operations/Test/MyStruct1.java
index 77ddf0328eea..62cbc7a2ce53 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 = 7628704812390363168L;
+    private static final long serialVersionUID = -5795738921995099551L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/Structure.java b/slice2java/python/test/Ice/operations/Test/Structure.java
index 3f3cd350e7d7..50a010b02836 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 = 1314594548283026246L;
+    private static final long serialVersionUID = -1384816196405953360L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/A.java b/slice2java/python/test/Ice/optional/Test/A.java
index 6135d0f45c96..f54ad7a882a1 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 = 7516484954031453072L;
+    private static final long serialVersionUID = -552945277330728432L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/B.java b/slice2java/python/test/Ice/optional/Test/B.java
index 097c64217a7a..59abbff06af7 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 = 8057866433309608419L;
+    private static final long serialVersionUID = 6461471523326046819L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/C.java b/slice2java/python/test/Ice/optional/Test/C.java
index 5690ec8762db..49d8c7c85e71 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 = -141179836871120131L;
+    private static final long serialVersionUID = 3946938827361493245L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/DerivedException.java b/slice2java/python/test/Ice/optional/Test/DerivedException.java
index 40295b8bcc21..2146d4c68fb4 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 = 3967245291858119919L;
+    private static final long serialVersionUID = -7965419777793386110L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/E.java b/slice2java/python/test/Ice/optional/Test/E.java
index 64e4bfc03221..2d6ae2151e10 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 = -1850740535892275822L;
+    private static final long serialVersionUID = -1850729204751963649L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/F.java b/slice2java/python/test/Ice/optional/Test/F.java
index 05fbfb1fe429..e4e2e538b5f1 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 = -6430496522540606751L;
+    private static final long serialVersionUID = -6430491849791413492L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/FixedStruct.java b/slice2java/python/test/Ice/optional/Test/FixedStruct.java
index 70705d80686c..c814c651a51c 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 = 1569605537609852918L;
+    private static final long serialVersionUID = 1569607650618259242L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/G.java b/slice2java/python/test/Ice/optional/Test/G.java
index c8eb5dc5ffd4..73ebe4e2e035 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 = -6098415830463564333L;
+    private static final long serialVersionUID = -1359295633205239789L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/G1.java b/slice2java/python/test/Ice/optional/Test/G1.java
index 76d803818c76..66fb7d41d9a8 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 = 7339780119467823969L;
+    private static final long serialVersionUID = 7339789567795161356L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/G2.java b/slice2java/python/test/Ice/optional/Test/G2.java
index 44ea8e526b20..ea724bee4a43 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 = 3824549395560483895L;
+    private static final long serialVersionUID = 3824561408576839760L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/MultiOptional.java b/slice2java/python/test/Ice/optional/Test/MultiOptional.java
index a160770ae0fe..905173809204 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 = 2446206067180195309L;
+    private static final long serialVersionUID = -5153522508373334928L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/OneOptional.java b/slice2java/python/test/Ice/optional/Test/OneOptional.java
index 5a88f72642b5..feea9cf320ec 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 = -7219600691037272552L;
+    private static final long serialVersionUID = -7219604007540767164L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/OptionalException.java b/slice2java/python/test/Ice/optional/Test/OptionalException.java
index a35e173b3cbe..0665a9ce0f88 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 = 1056655182010557056L;
+    private static final long serialVersionUID = 3734401664994405103L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java
index 9d6e17336ada..9e953267a324 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 = 260389394972503483L;
+    private static final long serialVersionUID = 1486190814039324539L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/RequiredException.java b/slice2java/python/test/Ice/optional/Test/RequiredException.java
index 42509c1875ec..d838ef096559 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 = 2894242922327295336L;
+    private static final long serialVersionUID = 2894243668750428357L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/SmallStruct.java b/slice2java/python/test/Ice/optional/Test/SmallStruct.java
index 0c1e4dbb5090..26292e066dc4 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 = 6700983203982818647L;
+    private static final long serialVersionUID = 6700994018796976380L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/VarStruct.java b/slice2java/python/test/Ice/optional/Test/VarStruct.java
index 77099ede5c66..c2e02e7acee6 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 = -1912288066221250839L;
+    private static final long serialVersionUID = -1912279299789000060L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/WD.java b/slice2java/python/test/Ice/optional/Test/WD.java
index d1b55de607e2..1407572c4368 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 = -4317941914082794695L;
+    private static final long serialVersionUID = -7373667616905679224L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/C1.java b/slice2java/python/test/Ice/packagemd/Test1/C1.java
index 3dd45cfe3946..48f9dc260679 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 = 1894596121966614716L;
+    private static final long serialVersionUID = 1894604795460856983L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/C2.java b/slice2java/python/test/Ice/packagemd/Test1/C2.java
index 7485adabee10..d2466760e7e7 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 = 2892575621486937198L;
+    private static final long serialVersionUID = 2892578839815874117L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/E1.java b/slice2java/python/test/Ice/packagemd/Test1/E1.java
index fb5d2cbf3151..1ec66418c8bb 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 = 5787345151990971891L;
+    private static final long serialVersionUID = 5787336478506208152L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test1/E2.java b/slice2java/python/test/Ice/packagemd/Test1/E2.java
index aaf07bce4761..a836295b797d 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 = 4908749216654126772L;
+    private static final long serialVersionUID = 4908757249575655455L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test1/def.java b/slice2java/python/test/Ice/packagemd/Test1/def.java
index e1061a371866..79b14931e974 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 = 7298389428295475680L;
+    private static final long serialVersionUID = 7298386209962145739L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test2/C1.java b/slice2java/python/test/Ice/packagemd/Test2/C1.java
index cbcd9ab99666..95ed68db4208 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 = -860918764773570603L;
+    private static final long serialVersionUID = -860911984572035250L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test2/C2.java b/slice2java/python/test/Ice/packagemd/Test2/C2.java
index 463cc2048541..0260d677a288 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 = 954150199872697311L;
+    private static final long serialVersionUID = 954151524827567544L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test2/E1.java b/slice2java/python/test/Ice/packagemd/Test2/E1.java
index 2ad6fd1aafab..4301e1ca3c02 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 = 6934988627294969850L;
+    private static final long serialVersionUID = 6934987302258846305L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test2/E2.java b/slice2java/python/test/Ice/packagemd/Test2/E2.java
index 48c40c55f48a..a416052a961f 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 = 5414536243831484358L;
+    private static final long serialVersionUID = 5414540379056128353L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test3/C1.java b/slice2java/python/test/Ice/packagemd/Test3/C1.java
index 7a063cca76d9..6dde8570e41d 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 = 5832349851191712532L;
+    private static final long serialVersionUID = 5832348531303630863L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test3/C2.java b/slice2java/python/test/Ice/packagemd/Test3/C2.java
index b34091d62bd8..c1b4b076a718 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 = 2769372749569531327L;
+    private static final long serialVersionUID = 2769379529837040024L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test3/E1.java b/slice2java/python/test/Ice/packagemd/Test3/E1.java
index c296e2305539..4f7dd6784589 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 = 5344586261424901979L;
+    private static final long serialVersionUID = 5344587581312950848L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test3/E2.java b/slice2java/python/test/Ice/packagemd/Test3/E2.java
index 193343f9dc11..603b007b9db2 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 = -8399051054403496473L;
+    private static final long serialVersionUID = -8399044274252240704L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/C.java b/slice2java/python/test/Ice/scope/Test/C.java
index 2beaecfac7f9..93fa33f3da3b 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 = -5190249916177945458L;
+    private static final long serialVersionUID = -5190247547762763763L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/C1.java b/slice2java/python/test/Ice/scope/Test/C1.java
index a788b11c3a88..15683b60a0bf 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 = 8893230730026762319L;
+    private static final long serialVersionUID = 8893232969597743052L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/C2.java b/slice2java/python/test/Ice/scope/Test/C2.java
index 4aa527053df0..55303e060798 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 = -2746715385163419076L;
+    private static final long serialVersionUID = 9079046821984469088L;
 
     /** @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 9f7f40fee394..e8d16f4fb798 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 = 4615625318306100973L;
+    private static final long serialVersionUID = 4615623112501094056L;
 
     /** @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 cf024b2cbe12..dc1037bdbb08 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 = 672580943582228621L;
+    private static final long serialVersionUID = 672588801051564681L;
 
     /** @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 bd3492b238b7..2f2afa61e32e 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 = 8654441904528891030L;
+    private static final long serialVersionUID = 8654439499650235557L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/Inner/S.java b/slice2java/python/test/Ice/scope/Test/Inner/S.java
index 1770e57d664f..61a9590487d4 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 = 3694613337489090138L;
+    private static final long serialVersionUID = 3694621326367805673L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S.java b/slice2java/python/test/Ice/scope/Test/S.java
index cfd105626b47..1f8508103902 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 = 2159705219493736996L;
+    private static final long serialVersionUID = 2159697393342146263L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S1.java b/slice2java/python/test/Ice/scope/Test/S1.java
index ad0f462083df..8620b323695e 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 = 1241671770299770614L;
+    private static final long serialVersionUID = 1241674650269239157L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S2.java b/slice2java/python/test/Ice/scope/Test/S2.java
index eafcfe06062b..46b3bdf8a2a6 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 = -5012374237052634427L;
+    private static final long serialVersionUID = 8156681541585820057L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java
index a5da700013f7..77b3a040f559 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 = -477021574249168034L;
+    private static final long serialVersionUID = -477024303042982237L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 76d7d015b52a..fd2db9befcad 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 = 3485210855254680824L;
+    private static final long serialVersionUID = 3485213602114134597L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 3d64ac129056..067ae60a580f 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 = 1717375831826629129L;
+    private static final long serialVersionUID = 1717378581264382004L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index e2ec6905e977..d5cb11073c95 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 = -7384921938965137968L;
+    private static final long serialVersionUID = -7384919217754353491L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index 4ef048f74fea..ee6b3858839e 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 = 3424380433868776504L;
+    private static final long serialVersionUID = 3424380613467964328L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 1f6f0a21f8f8..d980e5a5bf10 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 = -1172597815710488279L;
+    private static final long serialVersionUID = -1172597840315111367L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 8bf65cfdf219..d540076b1a87 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 = -1126109128531780144L;
+    private static final long serialVersionUID = -1126108948932592320L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index 9a50313eca73..2af86ebcb6b6 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 = -2097573303548916176L;
+    private static final long serialVersionUID = -2097573123949728352L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/B.java b/slice2java/python/test/Ice/slicing/objects/Test/B.java
index 95eb8af332d2..baca3ea44cb1 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 = 3689878171223309285L;
+    private static final long serialVersionUID = -7674933796425067464L;
 
     /** @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 69aa6f2bdb4a..66c200efc176 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 = -9165308329276422743L;
+    private static final long serialVersionUID = -8893362015374328460L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 690b8d5337a9..955bb9ee48f1 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 = -6397006049310655553L;
+    private static final long serialVersionUID = -6397001192118133312L;
 
     /** @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 64106b5e0df4..4718cc6e114b 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 = -9066879176408535534L;
+    private static final long serialVersionUID = -9066881363037824832L;
 
     /** @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 959bccf59b6d..8f0f7cf9e2d6 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 = -897343916667740346L;
+    private static final long serialVersionUID = -3269915594916025669L;
 
     /** @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 35efe589d117..4a7393115fef 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 = 6705401547765736546L;
+    private static final long serialVersionUID = 8683648714943955626L;
 
     /** @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 44d5d6e39cc8..0a49fdc50ac3 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 = -8015454660285544639L;
+    private static final long serialVersionUID = 2839197973086806179L;
 
     /** @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 b895d93f80cf..7ff2caa7f050 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 = 8247725023848138995L;
+    private static final long serialVersionUID = -7740273550662045453L;
 
     /** @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 39b24a8bf31b..aecc23cb3f75 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 = -6959814788814884875L;
+    private static final long serialVersionUID = -371996570169532037L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java
index 39d610ccf83f..3b6a22c04d1f 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 = -7655925233817169829L;
+    private static final long serialVersionUID = -7655923207450833621L;
 
     /** @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 7120b62d3f02..34d425b9a776 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 = -2271126626272274243L;
+    private static final long serialVersionUID = -2271128652451330961L;
 
     /** @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 b8dea7084b03..4f082ff8ebd4 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 = 4147520493464427250L;
+    private static final long serialVersionUID = 4147524583633039434L;
 
     /** @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 3dba07b67f3e..b3980656aa5f 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 = 481704185079431521L;
+    private static final long serialVersionUID = 481709101711499071L;
 
     /** @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 40d0ba512123..d49ea5b98713 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 = -4426891076445306625L;
+    private static final long serialVersionUID = -4426880763935685760L;
 
     /** @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 0cd3f0b8fffd..3eea80111d9d 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 = 850542461368774480L;
+    private static final long serialVersionUID = 850537769484301969L;
 
     /** @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 dcdaa1b92fbc..5d19495aed00 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 = -4328900091856594447L;
+    private static final long serialVersionUID = -4328906227726174701L;
 
     /** @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 71d34aaf0315..304dc79ae9fe 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 = -5081814547522514064L;
+    private static final long serialVersionUID = -5081802873852981543L;
 
     /** @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 af836dba6c4f..dea3fcd9d446 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 = 643084503093720213L;
+    private static final long serialVersionUID = 643079581296350919L;
 
     /** @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 72fb39522b2f..22da5c366b46 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 = -2438013797599419374L;
+    private static final long serialVersionUID = -2438007723786994613L;
 
     /** @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 fbf598adb586..49d7adb1fcde 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 = -1744019299390431757L;
+    private static final long serialVersionUID = -2402966431617271060L;
 
     /** @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 ab12e90ff4e9..95146f5e94ea 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 = -8813712267828357911L;
+    private static final long serialVersionUID = -8813708342979043295L;
 
     /** @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 03f0b18d2ea8..22b0fee93958 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 = 3651529234066393589L;
+    private static final long serialVersionUID = 3651528780836924904L;
 
     /** @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 892ea2b7e2e5..1e6d889e49d8 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 = 8804382534206175568L;
+    private static final long serialVersionUID = 8804376375133003981L;
 
     /** @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 b595961d6db4..eacd05948375 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 = -4989058880005934975L;
+    private static final long serialVersionUID = -4989057515002169783L;
 
     /** @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 a42ee5811189..5f27c1bda414 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 = -5353762028270953882L;
+    private static final long serialVersionUID = -5353761244263825925L;
 
     /** @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 0b67d183247d..bca5f9399cba 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 = -6522138550654021672L;
+    private static final long serialVersionUID = -6522135116656256216L;
 
     /** @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 d9cb5f448585..1710d1134bc1 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 = 7620286648849939419L;
+    private static final long serialVersionUID = 7620287347371498859L;
 
     /** @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 edaf716f2fa2..bfc0f2ae5ac0 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 = 1164454744704598105L;
+    private static final long serialVersionUID = 5966770921719671454L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java
index 1356c1b101e3..54eede4423ed 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 = 7721027263289466761L;
+    private static final long serialVersionUID = 6651431988929019963L;
 
     /** @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 cf47e59393ba..aa326acf6ee2 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 = 7366823400018886331L;
+    private static final long serialVersionUID = 2417775533892816967L;
 }
diff --git a/slice2java/python/test/Slice/escape/Clash/Cls.java b/slice2java/python/test/Slice/escape/Clash/Cls.java
index 72e8cbe8cfe5..b251844746e7 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 = 4771375535073704545L;
+    private static final long serialVersionUID = -7421881815770771436L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/escape/Clash/Ex.java b/slice2java/python/test/Slice/escape/Clash/Ex.java
index f04ff94e6f5a..ac60a0ac4892 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 = -7814459407898660437L;
+    private static final long serialVersionUID = 4839455696386271959L;
 }
diff --git a/slice2java/python/test/Slice/escape/Clash/St.java b/slice2java/python/test/Slice/escape/Clash/St.java
index 3b73b24fb918..866bfb1c89c5 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 = -6069581671187909448L;
+    private static final long serialVersionUID = 1789228422896569782L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/_continue.java b/slice2java/python/test/Slice/escape/and/_continue.java
index b9b624f3944f..77e3d68b27a3 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 = 1201377839141046007L;
+    private static final long serialVersionUID = 1201372544117938624L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/_for.java b/slice2java/python/test/Slice/escape/and/_for.java
index 8e395a9a802c..b2e0b3863cc6 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 = 2197932340371940378L;
+    private static final long serialVersionUID = -1429412345497809611L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/escape/and/is.java b/slice2java/python/test/Slice/escape/and/is.java
index 6819a8366711..27864aa1f914 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 = -4585936806093661044L;
+    private static final long serialVersionUID = -4585942416088499653L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/not.java b/slice2java/python/test/Slice/escape/and/not.java
index ccaf41d09bbb..841804042f93 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 = -5942194233858856391L;
+    private static final long serialVersionUID = 8045218677672779129L;
 }
diff --git a/slice2java/python/test/Slice/macros/Test/Default.java b/slice2java/python/test/Slice/macros/Test/Default.java
index 2982e168c330..c0d6b95dfe98 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 = -7003431207325475490L;
+    private static final long serialVersionUID = -1010154778512679554L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/macros/Test/NoDefault.java b/slice2java/python/test/Slice/macros/Test/NoDefault.java
index 7b2a8fb424db..538c295a3bba 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 = 3667485310828164927L;
+    private static final long serialVersionUID = 3754168609019764767L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/structure/Test/C.java b/slice2java/python/test/Slice/structure/Test/C.java
index 4290c708eda0..8d49099cb860 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 = 1667151498789365001L;
+    private static final long serialVersionUID = 1667159022874646730L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/structure/Test/S1.java b/slice2java/python/test/Slice/structure/Test/S1.java
index f1b5221a5260..a4b7daee55a3 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 = -5542855781006454047L;
+    private static final long serialVersionUID = -5542853712081877854L;
 }
diff --git a/slice2java/python/test/Slice/structure/Test/S2.java b/slice2java/python/test/Slice/structure/Test/S2.java
index 6fc47534e60b..4598c597177c 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 = -7695999908083192150L;
+    private static final long serialVersionUID = 5254204139955669460L;
 }
diff --git a/slice2java/python/test/Slice/structure/Test/S3.java b/slice2java/python/test/Slice/structure/Test/S3.java
index b7e3b19b4711..b19b15ff6e0d 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 = -5242955397342803762L;
+    private static final long serialVersionUID = 367226812270137864L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java
index 4bac6c00ad83..6241ec762a3e 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 = 1552451135328443L;
+    private static final long serialVersionUID = 2815413150410760699L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java
index ef5d4f784d09..7a8d863c268b 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 = 6302543990090939192L;
+    private static final long serialVersionUID = -1975079383313344072L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 890d6ee794f9..015c5ccf37b5 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 = 2669967957988509256L;
+    private static final long serialVersionUID = 8572928084377561118L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java
index f3b66c610f12..1e9d55945e87 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 = 382347884716829312L;
+    private static final long serialVersionUID = -4562819421796223488L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java
index 2d18da261e2b..32b7946c1138 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 = 5127392167022245908L;
+    private static final long serialVersionUID = 5127391566600883906L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java
index 1c360d3fb5aa..f395779affb9 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 = -4140970885688187141L;
+    private static final long serialVersionUID = -4889988227816389509L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java
index a2898c371fee..9de6d4a08609 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 = -3876273692469616162L;
+    private static final long serialVersionUID = 8094307178381858206L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java
index d60657b32dea..9698ed8e729d 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 = -8334693190710996933L;
+    private static final long serialVersionUID = -3980501315956436883L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/A.java b/slice2java/ruby/test/Ice/exceptions/Test/A.java
index 51e19303b815..6a353c968ec7 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 = 7823737105686792565L;
+    private static final long serialVersionUID = 7823745344006160893L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/B.java b/slice2java/ruby/test/Ice/exceptions/Test/B.java
index 6bdab63ff91b..59bf77ae4355 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 = -3861418957981325259L;
+    private static final long serialVersionUID = -3861410554353917507L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/C.java b/slice2java/ruby/test/Ice/exceptions/Test/C.java
index 30d25a9ea9d1..c6e211f73004 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 = 1080690796889577845L;
+    private static final long serialVersionUID = 1080699035208946173L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/D.java b/slice2java/ruby/test/Ice/exceptions/Test/D.java
index 40d4594f5825..2079ed077e3a 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 = 4780373310120752949L;
+    private static final long serialVersionUID = 4780381713748160701L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java
index 30c44a2ceae5..cd37afc4fbe2 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 = -4641410810496074527L;
+    private static final long serialVersionUID = -4641413841607027095L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/A.java b/slice2java/ruby/test/Ice/objects/Test/A.java
index 52303ede85ff..4863fef5f817 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 = -5195409359412846446L;
+    private static final long serialVersionUID = 2620588107732477224L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/A1.java b/slice2java/ruby/test/Ice/objects/Test/A1.java
index 40afe304f20c..9e4c8869b56a 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 = -5926743175932610979L;
+    private static final long serialVersionUID = -5926746120478830182L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/B.java b/slice2java/ruby/test/Ice/objects/Test/B.java
index 45dae3dc4cc2..e876985c5584 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 = -8890910373283248403L;
+    private static final long serialVersionUID = -8890918656721028580L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/B1.java b/slice2java/ruby/test/Ice/objects/Test/B1.java
index 08ed41a44301..ab942703615c 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 = 4543825786080176516L;
+    private static final long serialVersionUID = 5047266980249351620L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/Base.java b/slice2java/ruby/test/Ice/objects/Test/Base.java
index 054991dc4f85..8c734b20c3d6 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 = 2369887464258471036L;
+    private static final long serialVersionUID = 1076894098885169048L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/C.java b/slice2java/ruby/test/Ice/objects/Test/C.java
index bfebfc1014a4..2e8d5258db68 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 = -9171155855818793100L;
+    private static final long serialVersionUID = -9099959202582433325L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/COneMember.java b/slice2java/ruby/test/Ice/objects/Test/COneMember.java
index ba7d7bec1451..d43ef67dbbb8 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 = 3050971212895252805L;
+    private static final long serialVersionUID = 3050965188275163969L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java
index 9ec44260b2f6..31bae2ce9823 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 = -3139768939095453349L;
+    private static final long serialVersionUID = 6412626631802959195L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/D.java b/slice2java/ruby/test/Ice/objects/Test/D.java
index 27f62aa3ea6c..f26b2caa8721 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 = -5111365173047638661L;
+    private static final long serialVersionUID = -1747672133811624240L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/D1.java b/slice2java/ruby/test/Ice/objects/Test/D1.java
index ef11b69e8fc8..68dea5960544 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 = 2837277349292377667L;
+    private static final long serialVersionUID = -4875254033985270397L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/E.java b/slice2java/ruby/test/Ice/objects/Test/E.java
index b54de29d1b17..a01a731abe51 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 = 8069871797516948572L;
+    private static final long serialVersionUID = 6616899463380902406L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/EBase.java b/slice2java/ruby/test/Ice/objects/Test/EBase.java
index f6a88f071bf9..2577fbb25c10 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 = -4960215598235020466L;
+    private static final long serialVersionUID = -923121316328245106L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/EDerived.java b/slice2java/ruby/test/Ice/objects/Test/EDerived.java
index 4ccec7b44243..620dd15666ba 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 = 6828303390314651090L;
+    private static final long serialVersionUID = -7395598642111096942L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java
index 9127360b7567..50eb58a99741 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 = -6225292842135394870L;
+    private static final long serialVersionUID = -6225280205199304754L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java
index 1c289180a3fb..f69254ec19f6 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 = 3831306928505473492L;
+    private static final long serialVersionUID = -7187210531627244460L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/F.java b/slice2java/ruby/test/Ice/objects/Test/F.java
index e8c3221b286c..f6afc3c1030e 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 = -6029294838229056431L;
+    private static final long serialVersionUID = -4741272669505067055L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/F1.java b/slice2java/ruby/test/Ice/objects/Test/F1.java
index 1c7c45c7792a..e65b79876fdc 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 = 6192376636147772894L;
+    private static final long serialVersionUID = 6192366046129384918L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/F3.java b/slice2java/ruby/test/Ice/objects/Test/F3.java
index 69164c37855f..3046c1abd916 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 = 2012136225574101957L;
+    private static final long serialVersionUID = -8764301698158442047L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/K.java b/slice2java/ruby/test/Ice/objects/Test/K.java
index 64816ea47e08..556b90c2123b 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 = 4645158961615711990L;
+    private static final long serialVersionUID = 4645161745946343956L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/L.java b/slice2java/ruby/test/Ice/objects/Test/L.java
index 8e9d96b12143..15cfbd4cb12a 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 = 6629747534144133526L;
+    private static final long serialVersionUID = 6629739286982510673L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/M.java b/slice2java/ruby/test/Ice/objects/Test/M.java
index efca22f8fd99..78a247df4a0f 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 = -8088105530694623831L;
+    private static final long serialVersionUID = -8088097079397254354L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/Recursive.java b/slice2java/ruby/test/Ice/objects/Test/Recursive.java
index 530539c2e056..613cd07f99ab 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 = 3617885957026141227L;
+    private static final long serialVersionUID = 3617877510756320201L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/S.java b/slice2java/ruby/test/Ice/objects/Test/S.java
index 4a794d553dd0..ebfd3e6f883e 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 = 481774683674359077L;
+    private static final long serialVersionUID = 481771860528392290L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java
index d51fb672a9db..f0bb0cdce488 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 = 6227754021355729628L;
+    private static final long serialVersionUID = 6227748810213552984L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java
index 0a6a4d8d2594..7989b77c02ed 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 = -7251422199645463230L;
+    private static final long serialVersionUID = 7655757202800336578L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/StructKey.java b/slice2java/ruby/test/Ice/objects/Test/StructKey.java
index 0f3cba21bc01..60f2104f2428 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 = -736434062015935728L;
+    private static final long serialVersionUID = -4240218134035440566L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java
index b70bc4c9c5eb..af02c8f7d627 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 = 2723843338308197251L;
+    private static final long serialVersionUID = 2723846191085025618L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java
index fa09c39af474..ae35e44f00f9 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 = -8024181688661124499L;
+    private static final long serialVersionUID = -3065953890121972992L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java
index 2f75579fcb1d..f78fb1a857f7 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 = -242930717956347395L;
+    private static final long serialVersionUID = 920337845087215997L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java
index f3773eb949fe..9e333e5b6400 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 = -4520085069971981916L;
+    private static final long serialVersionUID = 8243664338808896009L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/Structure.java b/slice2java/ruby/test/Ice/operations/Test/Structure.java
index a881dffdf4db..e9db64df5301 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 = 5398575187178765081L;
+    private static final long serialVersionUID = -1015701975325361846L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/A.java b/slice2java/ruby/test/Ice/optional/Test/A.java
index b94a7d7d3e3b..8de5f74b1fba 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 = 1916261146821944720L;
+    private static final long serialVersionUID = 3018370145516982416L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/B.java b/slice2java/ruby/test/Ice/optional/Test/B.java
index 08930afa50da..0810b9b6c6bb 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 = 504165428422984803L;
+    private static final long serialVersionUID = -5823555233412705053L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/C.java b/slice2java/ruby/test/Ice/optional/Test/C.java
index f36211515212..a2787c21777a 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 = -7842846834679647107L;
+    private static final long serialVersionUID = 4242286096309967485L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java
index 2939730d2c02..d2f6421a73df 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 = 4968629899348614561L;
+    private static final long serialVersionUID = 6508784828074539279L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/E.java b/slice2java/ruby/test/Ice/optional/Test/E.java
index 13671768760d..1f1a4d8f80c4 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 = -1850739068842702254L;
+    private static final long serialVersionUID = -1850740535889790713L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/F.java b/slice2java/ruby/test/Ice/optional/Test/F.java
index a5e215b1b4e0..b6decfd75c1d 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 = -6430492539438809567L;
+    private static final long serialVersionUID = -6430496522539062412L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java
index 746a2fe3750f..b58796d4c285 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 = 1569601593470992325L;
+    private static final long serialVersionUID = 1569605537610146885L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/G.java b/slice2java/ruby/test/Ice/optional/Test/G.java
index d34dc61e8e0f..b2638bbfd452 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 = 7207155146153998483L;
+    private static final long serialVersionUID = 4301635630813062291L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/G1.java b/slice2java/ruby/test/Ice/optional/Test/G1.java
index a2c46db83887..16e48f78f08a 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 = 7339784228872578991L;
+    private static final long serialVersionUID = 7339780119470714113L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/G2.java b/slice2java/ruby/test/Ice/optional/Test/G2.java
index bd2b6d0672f9..958cb69a34b6 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 = 3824550862623584509L;
+    private static final long serialVersionUID = 3824549395560537319L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java
index e05fd544bbab..08f90c6d06c2 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 = 5404868145136493783L;
+    private static final long serialVersionUID = 5793050708033225411L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java
index 4dd17cd0f0c3..8a208497b7a1 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 = -7219599355503682965L;
+    private static final long serialVersionUID = -7219600691037531669L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java
index 5f082c062cad..bb55837dea97 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 = 3616233305051665952L;
+    private static final long serialVersionUID = -211194200429083613L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java
index 8982c55b7dfe..db3d152e7ab9 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 = 5439119690846047675L;
+    private static final long serialVersionUID = -6557878495731715013L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java
index 81b55e9efcf7..0f0e1b9b2736 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 = 2894238934056971558L;
+    private static final long serialVersionUID = 2894242922332350408L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java
index de7e18482462..199fd43c9c04 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 = 6700987357397318225L;
+    private static final long serialVersionUID = 6700983203982718257L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java
index d88f33ad357a..231f2977dca4 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 = -1912283956835469529L;
+    private static final long serialVersionUID = -1912288066218360695L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/WD.java b/slice2java/ruby/test/Ice/optional/Test/WD.java
index 7c9a23805764..49229fe23384 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 = 5100721425136595300L;
+    private static final long serialVersionUID = 8822090491683291658L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C.java b/slice2java/ruby/test/Ice/scope/Test/C.java
index b5feba2961be..27f3b6d6105c 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 = -5190250550210341178L;
+    private static final long serialVersionUID = -5190247245417545786L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C1.java b/slice2java/ruby/test/Ice/scope/Test/C1.java
index b7963c9251cc..653794a8f41b 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 = 8893236579172087406L;
+    private static final long serialVersionUID = 8893233147820790407L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C2.java b/slice2java/ruby/test/Ice/scope/Test/C2.java
index f63d812cde1b..1963e6ae5cc6 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 = 6166941461857928228L;
+    private static final long serialVersionUID = 100006562804046982L;
 
     /** @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 f61fa4be46d9..9853280f0e1a 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 = 4615626193833245804L;
+    private static final long serialVersionUID = 4615622895353569630L;
 
     /** @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 6803a338a648..8e3a6a958a4e 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 = 672586757826216080L;
+    private static final long serialVersionUID = 672588739039500890L;
 
     /** @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 94bed4949ea2..20efb43370e4 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 = 8654436006471116201L;
+    private static final long serialVersionUID = 8654439486886324834L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java
index 9fdd7c95c363..b568187dc284 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 = 3694623618946344421L;
+    private static final long serialVersionUID = 3694621468576287406L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S.java b/slice2java/ruby/test/Ice/scope/Test/S.java
index e0ef6450dd91..a6dbc4585c68 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 = 2159695183419996891L;
+    private static final long serialVersionUID = 2159697336368529040L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S1.java b/slice2java/ruby/test/Ice/scope/Test/S1.java
index 509a270f0f12..c5a0d06db157 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 = 1241676976295911511L;
+    private static final long serialVersionUID = 1241674787183067710L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S2.java b/slice2java/ruby/test/Ice/scope/Test/S2.java
index 01de98056d00..299b48ddb302 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 = -105270559215815075L;
+    private static final long serialVersionUID = 6689847853810004479L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java
index 7f0fd592b833..6cb611dc5558 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 = -477017205289572220L;
+    private static final long serialVersionUID = -477021505882473884L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 7a1dd8ab8515..8c920ec3a140 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 = 3485209939527347490L;
+    private static final long serialVersionUID = 3485210933943918594L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index bbff51e6dce3..c4c290fd9f99 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 = 1717370822297771731L;
+    private static final long serialVersionUID = 1717375784103734515L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 1d08f2d8d41f..1d4c92142da3 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 = -7384916758962508662L;
+    private static final long serialVersionUID = -7384921880919982486L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java
index 13a1a61f7a73..430bab07fa2e 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 = 3204400047143026842L;
+    private static final long serialVersionUID = -8284370034352191176L;
 
     /** @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 14838a51f62d..bc66bb93b709 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 = -3547944444507826218L;
+    private static final long serialVersionUID = 9093973928732243828L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 51699a3625e9..16739ea5b292 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 = -6397003939147884510L;
+    private static final long serialVersionUID = -6397003976741791926L;
 
     /** @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 4e43de55d0b1..d912878762db 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 = -9066879925397618764L;
+    private static final long serialVersionUID = -9066888002505678548L;
 
     /** @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 200e28306fde..307ad6759d1b 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 = -7864702568108076199L;
+    private static final long serialVersionUID = -5571977652981750693L;
 
     /** @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 0949d0869d55..6358778b3869 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 = -6885383117023254588L;
+    private static final long serialVersionUID = -4624362124005611379L;
 
     /** @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 77b11370e97b..bc8720594014 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 = 516926203322119765L;
+    private static final long serialVersionUID = 7753906284027646379L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java
index 95d49e177d5a..9910c5ddc8e4 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 = -7655919205054630190L;
+    private static final long serialVersionUID = -7655926997676554323L;
 
     /** @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 89f629b48867..1f73262a6d91 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 = -2271132820097051286L;
+    private static final long serialVersionUID = -2271124862042610408L;
 
     /** @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 ee5c2dafe588..b7f855629dfc 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 = 481704934119899802L;
+    private static final long serialVersionUID = 481713096257249476L;
 
     /** @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 432ab51b1acb..9660eaf8f62b 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 = -4426894586604078110L;
+    private static final long serialVersionUID = -4426894624041309174L;
 
     /** @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 7e9cb6eb0ee2..de6f49df5222 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 = 850546136978311898L;
+    private static final long serialVersionUID = 850546174263704010L;
 
     /** @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 bc85fee0d4e5..59b13e074adf 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 = -4328903354338557397L;
+    private static final long serialVersionUID = -4328903316867659966L;
 
     /** @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 b7ebf50c3415..1e0321604659 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 = -5081816604740476575L;
+    private static final long serialVersionUID = -5081816775230431088L;
 
     /** @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 057c23cdb367..5350229a9c48 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 = 643078309271018739L;
+    private static final long serialVersionUID = 643086181939506539L;
 
     /** @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 b74fae442738..d49ab07443ea 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 = -2438003711289610638L;
+    private static final long serialVersionUID = -2438001089440268061L;
 
     /** @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 962ecc86e1df..07743b892a7a 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 = 3651524613180090708L;
+    private static final long serialVersionUID = 3651532571219298203L;
 
     /** @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 548a14e4ec61..8dc85e39fd23 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 = 8804375092772443761L;
+    private static final long serialVersionUID = 8804372385712830782L;
 
     /** @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 99bbdf0a129c..9381c82fbed9 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 = -5353757231763415801L;
+    private static final long serialVersionUID = -5353754444609141048L;
 
     /** @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 7f9a8f68a45c..31b6b09072d6 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 = -6522133679223623935L;
+    private static final long serialVersionUID = -6522141921436604399L;
 
     /** @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 7850dfca1f64..40d1d0510420 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 = 7620286065108072962L;
+    private static final long serialVersionUID = 7620283523289811858L;
 
     /** @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 06422dcbdec2..8904ae280142 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 = 7071450787347777492L;
+    private static final long serialVersionUID = 901668432837014101L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/and.java b/slice2java/ruby/test/Slice/escape/BEGIN/and.java
index 0bf6577b442c..b95dfa7b7cdf 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 = 1440097932982133360L;
+    private static final long serialVersionUID = 1440105450701396355L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/display.java b/slice2java/ruby/test/Slice/escape/BEGIN/display.java
index 1a30481f25ef..4c266ccc9ff4 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 = -1800782211022462732L;
+    private static final long serialVersionUID = -7998933327960202112L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/next.java b/slice2java/ruby/test/Slice/escape/BEGIN/next.java
index 881fe462aa0e..9999da824366 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 = 3375556850323059623L;
+    private static final long serialVersionUID = 3375554953081736852L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java
index 6d5fd76ab344..cb2202221b25 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 = 7680454111762205423L;
+    private static final long serialVersionUID = 4046464431554516527L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/Clash/Cls.java b/slice2java/ruby/test/Slice/escape/Clash/Cls.java
index cb3193d51061..6ab945fbfb8d 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 = 1863837934677688675L;
+    private static final long serialVersionUID = 5903838702630183693L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/escape/Clash/Ex.java b/slice2java/ruby/test/Slice/escape/Clash/Ex.java
index 3c9e2ea4cdf7..c9ad3a4b23e0 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 = -3231637901408108761L;
+    private static final long serialVersionUID = 1304915480287736813L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/Clash/St.java b/slice2java/ruby/test/Slice/escape/Clash/St.java
index d817f1f7b0d5..9921357f7fd0 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 = -3322296519965122904L;
+    private static final long serialVersionUID = 6043709953677871967L;
 }
diff --git a/slice2java/ruby/test/Slice/macros/Test/Default.java b/slice2java/ruby/test/Slice/macros/Test/Default.java
index de0fe8fdcb05..1a953e777f90 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 = -7754716099874034210L;
+    private static final long serialVersionUID = -3073925037595549922L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java
index 1199cef8c738..78963187ab28 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 = 6801744472713420479L;
+    private static final long serialVersionUID = -6579373780421773313L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/structure/Test/C.java b/slice2java/ruby/test/Slice/structure/Test/C.java
index f805473f5f96..998fe69a8847 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 = -3172282991223254298L;
+    private static final long serialVersionUID = -3172282953844738024L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/structure/Test/S1.java b/slice2java/ruby/test/Slice/structure/Test/S1.java
index 1c873ff74d33..e88d510bfbed 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 = -5542853741691205749L;
+    private static final long serialVersionUID = -5542853698998798918L;
 }
diff --git a/slice2java/ruby/test/Slice/structure/Test/S2.java b/slice2java/ruby/test/Slice/structure/Test/S2.java
index d56c16f384c5..e099d401346e 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 = -4716539014888005299L;
+    private static final long serialVersionUID = 6115011038314124990L;
 }
diff --git a/slice2java/scripts/Test/Common/Config.java b/slice2java/scripts/Test/Common/Config.java
index da3548478815..9486b9317d2b 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 = 8403508419634215027L;
+    private static final long serialVersionUID = -6640771135418374331L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/scripts/Test/Common/OptionOverrides.java b/slice2java/scripts/Test/Common/OptionOverrides.java
index 2e5c409b07a1..4fc6fa4d8661 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 = -7725712772145602550L;
+    private static final long serialVersionUID = 6276255181654203292L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/scripts/Test/Common/ProcessFailedException.java b/slice2java/scripts/Test/Common/ProcessFailedException.java
index 246e627689ae..e89dc5140f3a 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 = 5103744171243612561L;
+    private static final long serialVersionUID = 5103746773478095143L;
 }
diff --git a/slice2java/scripts/Test/Common/TestCaseFailedException.java b/slice2java/scripts/Test/Common/TestCaseFailedException.java
index ef534e387195..34433276b32d 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 = 7577593834730863363L;
+    private static final long serialVersionUID = 7577601892125936053L;
 }
diff --git a/slice2java/scripts/Test/Common/TestCaseNotExistException.java b/slice2java/scripts/Test/Common/TestCaseNotExistException.java
index 3b1c8e090bf2..10d4cc9a185e 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 = -8656774076485229539L;
+    private static final long serialVersionUID = -8656782384572419157L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java
index 5c977c744c19..418f1da4059a 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 = 8990436602368252875L;
+    private static final long serialVersionUID = 8990430444856710484L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java
index fef6c1217a24..0edb37ee2aed 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 = -755210119929947279L;
+    private static final long serialVersionUID = -8638474369995948362L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java
index 28eeb2bac9f0..8c01f2493816 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 = -5089367034196215205L;
+    private static final long serialVersionUID = -5089368497420657371L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java
index 110dfbc19c41..1c462aeebdd3 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 = 7877667976777852969L;
+    private static final long serialVersionUID = 2815701447195764767L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java
index 1142ecfa8ec0..3fb5d48bd316 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 = -4540744439270173999L;
+    private static final long serialVersionUID = -4546925138081436623L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java
index 7a999c8932be..ceddc1c1b8b7 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 = -4022845363665420902L;
+    private static final long serialVersionUID = -381802118489155110L;
 
     /** @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 0bcf08261d14..5db864bbe6cb 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 = -7326565434136239433L;
+    private static final long serialVersionUID = 2394135337813367159L;
 
     /** @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 1a4a64b7e37f..0b22aa23f1fc 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 = 478893709686294457L;
+    private static final long serialVersionUID = 5814742883671007120L;
 
     /** @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 a35b5d3fd78f..0c0e14a33209 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 = -1226597310515234449L;
+    private static final long serialVersionUID = -3862348560737388529L;
 
     /** @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 9e6b387440a5..73ebdf03ffcd 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 = 7133587011133986232L;
+    private static final long serialVersionUID = 4516576591973689737L;
 
     /** @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 b30cb185ccd0..f4ee27e3b615 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 = -5546688766715421753L;
+    private static final long serialVersionUID = -8682272469998597745L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java
index 3ccc8cbac327..bc8a7e806532 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 = -3561826394358432257L;
+    private static final long serialVersionUID = 6805051097444470518L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java
index ec8745a9f5de..99c5c7cfa2a4 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 = -7960589197502407067L;
+    private static final long serialVersionUID = 8335150005170845541L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java
index a323ffccb2a0..e43ca9d7c601 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 = 2993352715621815437L;
+    private static final long serialVersionUID = 3230031679512698326L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java
index a40a6d391852..60c60d34b97d 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 = 6685125891522023044L;
+    private static final long serialVersionUID = 4213935344065308324L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java
index 62188d850618..f3c7fa011ba7 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 = 5447243698719968912L;
+    private static final long serialVersionUID = 5447257308200170254L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java
index 5ba80db369db..2945908f163f 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 = 8448733308400665589L;
+    private static final long serialVersionUID = -3778340910419120687L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java
index b17346b49f45..cda5869326ed 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 = 7661454771535746016L;
+    private static final long serialVersionUID = 8093467729063696844L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java
index 912a1e3519c9..c4518539fed0 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 = 8518642582734080083L;
+    private static final long serialVersionUID = 1938262512052156862L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java
index 6b1d362aca0c..5a34d44e3e62 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 = -243191333766076520L;
+    private static final long serialVersionUID = -243177744949361658L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java
index e38b8d0281ba..de7541085e7d 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 = 7644448234026889514L;
+    private static final long serialVersionUID = 7644439207992706638L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/Admin.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/Admin.java
index 505fd41ab964..26a36e7811da 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/Admin.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/Admin.java
@@ -252,8 +252,8 @@ boolean isServerEnabled(String id, com.zeroc.Ice.Current current)
      * @throws ServerStartException Raised if the server couldn't be started.
      **/
     java.util.concurrent.CompletionStage<Void> startServerAsync(String id, com.zeroc.Ice.Current current)
-        throws ServerStartException,
-               ServerNotExistException,
+        throws ServerNotExistException,
+               ServerStartException,
                DeploymentException,
                NodeUnreachableException;
 
@@ -268,8 +268,8 @@ java.util.concurrent.CompletionStage<Void> startServerAsync(String id, com.zeroc
      * @throws ServerStopException Raised if the server couldn't be stopped.
      **/
     java.util.concurrent.CompletionStage<Void> stopServerAsync(String id, com.zeroc.Ice.Current current)
-        throws ServerStopException,
-               ServerNotExistException,
+        throws ServerNotExistException,
+               ServerStopException,
                DeploymentException,
                NodeUnreachableException;
 
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdminPrx.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdminPrx.java
index 4ed09d045ad2..81848e52e3cb 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdminPrx.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdminPrx.java
@@ -1613,8 +1613,8 @@ default com.zeroc.Ice.OutgoingAsync<java.lang.Boolean> _iceI_isServerEnabledAsyn
      * @throws ServerStartException Raised if the server couldn't be started.
      **/
     default void startServer(String id)
-        throws ServerStartException,
-               ServerNotExistException,
+        throws ServerNotExistException,
+               ServerStartException,
                DeploymentException,
                NodeUnreachableException
     {
@@ -1631,8 +1631,8 @@ default void startServer(String id)
      * @throws ServerStartException Raised if the server couldn't be started.
      **/
     default void startServer(String id, java.util.Map<String, String> context)
-        throws ServerStartException,
-               ServerNotExistException,
+        throws ServerNotExistException,
+               ServerStartException,
                DeploymentException,
                NodeUnreachableException
     {
@@ -1640,11 +1640,11 @@ default void startServer(String id, java.util.Map<String, String> context)
         {
             _iceI_startServerAsync(id, context, true).waitForResponseOrUserEx();
         }
-        catch(ServerStartException ex)
+        catch(ServerNotExistException ex)
         {
             throw ex;
         }
-        catch(ServerNotExistException ex)
+        catch(ServerStartException ex)
         {
             throw ex;
         }
@@ -1702,8 +1702,8 @@ default com.zeroc.Ice.OutgoingAsync<Void> _iceI_startServerAsync(String iceP_id,
     /** @hidden */
     static final Class<?>[] _iceE_startServer =
     {
-        ServerStartException.class,
         ServerNotExistException.class,
+        ServerStartException.class,
         DeploymentException.class,
         NodeUnreachableException.class
     };
@@ -1717,8 +1717,8 @@ default com.zeroc.Ice.OutgoingAsync<Void> _iceI_startServerAsync(String iceP_id,
      * @throws ServerStopException Raised if the server couldn't be stopped.
      **/
     default void stopServer(String id)
-        throws ServerStopException,
-               ServerNotExistException,
+        throws ServerNotExistException,
+               ServerStopException,
                DeploymentException,
                NodeUnreachableException
     {
@@ -1735,8 +1735,8 @@ default void stopServer(String id)
      * @throws ServerStopException Raised if the server couldn't be stopped.
      **/
     default void stopServer(String id, java.util.Map<String, String> context)
-        throws ServerStopException,
-               ServerNotExistException,
+        throws ServerNotExistException,
+               ServerStopException,
                DeploymentException,
                NodeUnreachableException
     {
@@ -1744,11 +1744,11 @@ default void stopServer(String id, java.util.Map<String, String> context)
         {
             _iceI_stopServerAsync(id, context, true).waitForResponseOrUserEx();
         }
-        catch(ServerStopException ex)
+        catch(ServerNotExistException ex)
         {
             throw ex;
         }
-        catch(ServerNotExistException ex)
+        catch(ServerStopException ex)
         {
             throw ex;
         }
@@ -1806,8 +1806,8 @@ default com.zeroc.Ice.OutgoingAsync<Void> _iceI_stopServerAsync(String iceP_id,
     /** @hidden */
     static final Class<?>[] _iceE_stopServer =
     {
-        ServerStopException.class,
         ServerNotExistException.class,
+        ServerStopException.class,
         DeploymentException.class,
         NodeUnreachableException.class
     };
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java
index c5b3a562484d..134940e7b1aa 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 = 4699857062980668368L;
+    private static final long serialVersionUID = 4699859762139328206L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java
index 7a7d84a26167..e2c4475a3455 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 = -4890418126659250578L;
+    private static final long serialVersionUID = 6624383555063515997L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java
index 0b6f58521eb6..784b57e85409 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 = 1343114013201506180L;
+    private static final long serialVersionUID = 8908170581411574601L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java
index 65d5a5f3e0bb..7c2d1c0424d7 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 = -7270581353158538465L;
+    private static final long serialVersionUID = -7270584217776929023L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java
index e1849fce91df..2a1f50de2c2e 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 = -3837888278576408133L;
+    private static final long serialVersionUID = 3635834481119559849L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java
index 22ee1356ee78..c4f879b2fac9 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 = 2553706426921150324L;
+    private static final long serialVersionUID = 5314217790250253822L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java
index ee87aeaa9f4d..4dc353d1455e 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 = 4463359067340347129L;
+    private static final long serialVersionUID = 4463372904275240167L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java
index 9045d337010b..69c929708798 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 = -1971523986644378669L;
+    private static final long serialVersionUID = -1971531651740064688L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java
index 8c502e1249b9..6f5b9ac98025 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 = -2108809545567272819L;
+    private static final long serialVersionUID = -2108804938713624599L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java
index 4f14dd293247..2c94e884113b 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 = 785533145217901516L;
+    private static final long serialVersionUID = 6276003401648735631L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java
index d97d231e8753..b3e852811ee4 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 = -6801506980057280103L;
+    private static final long serialVersionUID = -6801504213894017401L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java
index cdec4dc36dbb..7c8e10cbe7c4 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 = 7302670633787027710L;
+    private static final long serialVersionUID = 1388238194032500377L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java
index eff621b43e28..82ff6838dbdc 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 = -8985157874900295766L;
+    private static final long serialVersionUID = -8985149736073925452L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java
index 5d2828662793..e3136ed29615 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 = 2337763622725079826L;
+    private static final long serialVersionUID = 2337752194413447112L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java
index 949566d6ab33..ee2bcb68b64e 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 = -6003728498218527649L;
+    private static final long serialVersionUID = -6003724751866822469L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java
index 77ce50fc5e79..3b070c5b5aa5 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 = -7669797801889296353L;
+    private static final long serialVersionUID = 4446548881566960199L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java
index 8854956df7f3..da313ae595b2 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 = -2975206543084449618L;
+    private static final long serialVersionUID = 5182736174742536923L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java
index 1d5b5f3474ef..d72a50b3af9f 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 = 8297933933332462859L;
+    private static final long serialVersionUID = 9010052636237780807L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java
index 6a699a6563db..5e8e3fd42544 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 = -4018184448834877864L;
+    private static final long serialVersionUID = 803883602892725428L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java
index 2ea43fd17d3c..a5b6edf65512 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 = -5774530042081163323L;
+    private static final long serialVersionUID = -5774527265567568549L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java
index a3f3b831ceb9..d011f5ccae6f 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 = 5542846931470181540L;
+    private static final long serialVersionUID = 7082733763871914020L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java
index e65f2f937d78..1faebeef96f4 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 = -6784927570927107986L;
+    private static final long serialVersionUID = -5727480698236541380L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java
index a0dac3146ede..6806de78911b 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 = 518892885806814740L;
+    private static final long serialVersionUID = -3857285401310237725L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java
index f770693bbabd..7c7186a7fe1b 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 = 6991431145619389178L;
+    private static final long serialVersionUID = 6991423073949229499L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java
index 1ee33a0446e0..2f98ba24710a 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 = 249804084728010402L;
+    private static final long serialVersionUID = -8911546801593363730L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java
index e1c8bffe461f..7de141d565ba 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 = 7672376352143797479L;
+    private static final long serialVersionUID = 7672379299411653926L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java
index d2b7a78f66be..f04f8ca2fbe1 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 = 2733104070437909033L;
+    private static final long serialVersionUID = 2733090455939235944L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java
index 51323c7eed6c..061bf22c7929 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 = -5694240666006312661L;
+    private static final long serialVersionUID = -5694237831168027632L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java
index 6bdc3c25dfe9..f2312827feeb 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 = 7526796646139101324L;
+    private static final long serialVersionUID = 7526799314321399058L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java
index 11b28e108cb0..b32d64ad10ad 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 = 3793371808246247652L;
+    private static final long serialVersionUID = 4911649510698606372L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java
index 91f8566f89e5..d4d97754b525 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 = 5491727442261832129L;
+    private static final long serialVersionUID = 4378248376094715463L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java
index 5b212a2ac890..8d5677cbafd9 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 = 8960321658437862887L;
+    private static final long serialVersionUID = -37945171844183833L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java
index eae7d645fdba..39d8c5a2e7d9 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 = 8544191074220884912L;
+    private static final long serialVersionUID = 8544193943848712366L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java
index c4c1785edfd5..225101ee55f2 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 = 2609208479587632753L;
+    private static final long serialVersionUID = -7987463398204326415L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java
index c0c4e08688d0..03b0d46b67fb 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 = 7547255609340348406L;
+    private static final long serialVersionUID = 1796634327120185654L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java
index a42fed45a819..8adaeceab877 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 = -7935268804810742285L;
+    private static final long serialVersionUID = -5135140989838795952L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java
index d51717e3cb09..2fb0e15d38cd 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 = -964651276232247348L;
+    private static final long serialVersionUID = -7461185408353353000L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java
index 7508b93cf535..77ec502d850c 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 = -1809552904335609296L;
+    private static final long serialVersionUID = -1769264398829779172L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java
index bb9a4d4c90d3..6e9de324551f 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 = -5975843409679861727L;
+    private static final long serialVersionUID = -5811432833766142540L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java
index 599ca30438f7..eca1fe7c645c 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 = -2699424083307579158L;
+    private static final long serialVersionUID = -2699426854811950220L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java
index 9702b30b33d8..982fff0d5319 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 = 6765412121660596487L;
+    private static final long serialVersionUID = -7669420229653303161L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java
index 95aa1d4c678c..6004d662458f 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 = -498008490273307009L;
+    private static final long serialVersionUID = 7800847794528278527L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java
index 604294944ce6..5ed8138f4a04 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 = 4198320345718525153L;
+    private static final long serialVersionUID = -3563056462929937311L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java
index 48dbd3068e97..d284048ab4f3 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 = 8027100686610867897L;
+    private static final long serialVersionUID = -1378631787649907655L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java
index 5de47f5e509e..852e8cf98219 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 = 8932687218785450501L;
+    private static final long serialVersionUID = 2898998057855108145L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java
index 0ca39e1b25b9..3f720ef511df 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 = -460070089962063737L;
+    private static final long serialVersionUID = -193779374057987788L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java
index c82cd9cb5c8e..b594be4ca434 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 = 7896660765125388734L;
+    private static final long serialVersionUID = 7896656412722223442L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java
index 6b4fc1d88c96..082c341909b3 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 = -340728943491214005L;
+    private static final long serialVersionUID = -7233802808782044717L;
 
     /** @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 0a39c3bf4a8b..bf69cf7a7ed4 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 = -995724483085630559L;
+    private static final long serialVersionUID = -4576306092500684255L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java
index 1627306535bc..ce6fdad42b9b 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 = -1090057182897870817L;
+    private static final long serialVersionUID = -1090058642261127053L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java
index 3933dcc452b7..debdf73885b0 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 = 243154317947876407L;
+    private static final long serialVersionUID = 243158990332216731L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java
index 304168dabeda..8fa76f1efe75 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 = 3225262646344282090L;
+    private static final long serialVersionUID = -7233323175936868538L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java
index 8f3cdbb11158..c11b3cfc268b 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 = -8653877434498648613L;
+    private static final long serialVersionUID = -8653879214146536393L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java
index 7ddbaa8daa90..888710500bc5 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 = -6283743481203644550L;
+    private static final long serialVersionUID = -6283748153891441386L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java
index f15bb544c05a..d24a979f6d3b 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 = 3979364110498959318L;
+    private static final long serialVersionUID = 3979365890450303354L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Base.java b/slice2java/swift/test/Ice/defaultValue/Test/Base.java
index a3ecbb9103de..f3300c70293f 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 = 5911078511167310421L;
+    private static final long serialVersionUID = 8237007691208291098L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java
index 2ec69819dc3e..d1175dbf6bbd 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 = -7569249672736474271L;
+    private static final long serialVersionUID = 1439034647318498222L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java
index 2706edf30b2d..c67275ad33cf 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 = -7803256444509275658L;
+    private static final long serialVersionUID = -1606930597815912460L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java
index 6333f0911e09..3403b14f5259 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 = 2818562280194452289L;
+    private static final long serialVersionUID = 7291236352821379907L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java
index 9b5747a2e050..eb7529801519 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 = 2622371116300736323L;
+    private static final long serialVersionUID = -3419836203370839410L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java
index c41c4db40d8e..d638e6cf9837 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 = 5089655348817864575L;
+    private static final long serialVersionUID = 6518097250751097008L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java
index 06b9e2b3e323..012eeb573609 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 = -4664654987560826687L;
+    private static final long serialVersionUID = -681153354470638708L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/A.java b/slice2java/swift/test/Ice/exceptions/Test/A.java
index 8acd2df1e54b..5fef8e179010 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 = 7823740610887851055L;
+    private static final long serialVersionUID = 7823744637802921581L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/B.java b/slice2java/swift/test/Ice/exceptions/Test/B.java
index 12763cc7fe8a..05f696fe74f0 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 = -3861420742936802705L;
+    private static final long serialVersionUID = -3861405640392290899L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/C.java b/slice2java/swift/test/Ice/exceptions/Test/C.java
index 7d50421822f7..29d445aefb10 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 = 1080694302090636335L;
+    private static final long serialVersionUID = 1080698329005706861L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/D.java b/slice2java/swift/test/Ice/exceptions/Test/D.java
index f38e15d66f33..c38c1e7c6d63 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 = 4780371525165275503L;
+    private static final long serialVersionUID = 4780386627709787309L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/E.java b/slice2java/swift/test/Ice/exceptions/Test/E.java
index 08c5c6de1d05..6baf4e6bb1c3 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 = -1876979334775090344L;
+    private static final long serialVersionUID = -1876975346989885299L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/F.java b/slice2java/swift/test/Ice/exceptions/Test/F.java
index f85a1817450d..ff2e1f53c853 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 = 733469512290720603L;
+    private static final long serialVersionUID = 733476230391083918L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java
index fad1d419d878..89631bed1b13 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 = -4641408948042527301L;
+    private static final long serialVersionUID = -4641415870273155079L;
 }
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java
index 0fc4f466dc8d..65ebd61cfa37 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 = 954232901625966111L;
+    private static final long serialVersionUID = 954229304965054018L;
 
     /** @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 cefbda54dcf5..380aad5e32a6 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 = 1339629832421377157L;
+    private static final long serialVersionUID = 1339633013379258072L;
 
     /** @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 b994554818cf..007d4da879c0 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 = -2729304993704731257L;
+    private static final long serialVersionUID = -2729307267902951462L;
 
     /** @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 c374280375e8..200ac7f52954 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 = -3435402026893850751L;
+    private static final long serialVersionUID = -3435398845926778660L;
 
     /** @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 32621b73eb72..cb816815eb9c 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 = -836177508938642792L;
+    private static final long serialVersionUID = -836181020512323515L;
 
     /** @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 70e3987f5608..3d7af56ebc74 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 = 1132524084931405349L;
+    private static final long serialVersionUID = 1132521976031881080L;
 
     /** @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 6719855eddaf..46b1286af484 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 = -6335559291670072281L;
+    private static final long serialVersionUID = -6335555945404295558L;
 
     /** @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 1f937e77e767..f759b8aed4a0 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 = -4007408278002362335L;
+    private static final long serialVersionUID = -4007410386892695428L;
 
     /** @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 d8cae755f5f1..c4614b273274 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 = 991426889719857177L;
+    private static final long serialVersionUID = 991428748224237380L;
 
     /** @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 3fabfb212533..b7473e31037c 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 = -2880332824555633467L;
+    private static final long serialVersionUID = -2880334933749549672L;
 
     /** @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 64f327ab5caa..39d24eaabb57 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 = -8808271776387367481L;
+    private static final long serialVersionUID = -8808268430425182566L;
 
     /** @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 ecc44a598bce..2915f5de22e5 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 = -771851483313415999L;
+    private static final long serialVersionUID = -771853592498141028L;
 
     /** @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 2b6a7da8de69..d30703368504 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 = 6566352762066277018L;
+    private static final long serialVersionUID = 6566354705648697415L;
 
     /** @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 5abd1971cc2d..b7f4f5d09aae 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 = 6983795379586556517L;
+    private static final long serialVersionUID = 6983798891160233016L;
 
     /** @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 565adc673535..cee4289d3eab 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 = -1175218181048010905L;
+    private static final long serialVersionUID = -1175220124639635398L;
 
     /** @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 d83dbb54e6cc..03f61f59c0c4 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 = -3279722196364187807L;
+    private static final long serialVersionUID = -3279718684781320132L;
 
     /** @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 86808fe9146e..27a8153d391a 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 = -4359168188482279653L;
+    private static final long serialVersionUID = -4359171785134000570L;
 
     /** @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 0da6b4c77fc6..5a9a075daf39 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 = 5904686619972765189L;
+    private static final long serialVersionUID = 5904689800930646104L;
 
     /** @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 918be54024cc..8cc9b879d62e 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 = 1835751793846656775L;
+    private static final long serialVersionUID = 1835749519648436570L;
 
     /** @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 a653617fa8c8..1be642b9e5bd 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 = -2252402680124167935L;
+    private static final long serialVersionUID = -2252399499157095844L;
 
     /** @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 80ece6d02888..e2ac4d8a3bde 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 = -1203536261876946028L;
+    private static final long serialVersionUID = -1203539773459243959L;
 
     /** @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 16fa54acd9a5..0977181ef3bb 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 = -7537767946655879771L;
+    private static final long serialVersionUID = -7537770055555404040L;
 
     /** @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 d5f9b8321151..8d9d34193a2c 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 = 3440892750452194215L;
+    private static final long serialVersionUID = 3440896096717970938L;
 
     /** @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 43201c9c43c1..0657b210cd48 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 = 9151101204901609377L;
+    private static final long serialVersionUID = 9151099096011276284L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/A.java b/slice2java/swift/test/Ice/objects/Test/A.java
index 674f6c2cf8ec..d444c52e1641 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 = -6797943838771811557L;
+    private static final long serialVersionUID = 5022360914543959331L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/A1.java b/slice2java/swift/test/Ice/objects/Test/A1.java
index fed0aea50676..2f925bee0fae 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 = -5926745922963969033L;
+    private static final long serialVersionUID = -5926744065678443817L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/B.java b/slice2java/swift/test/Ice/objects/Test/B.java
index 2a1a452e3886..cd2e1be142f8 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 = -8890918288571613009L;
+    private static final long serialVersionUID = -8890915269218318305L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/B1.java b/slice2java/swift/test/Ice/objects/Test/B1.java
index f18e8102a699..0cde1b827dc4 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 = 1582311717810981764L;
+    private static final long serialVersionUID = 3671789637698319172L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Base.java b/slice2java/swift/test/Ice/objects/Test/Base.java
index 1b8ce3819723..ee8434b8aaba 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 = 5228570043918766986L;
+    private static final long serialVersionUID = 2935701875450747043L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/BaseEx.java b/slice2java/swift/test/Ice/objects/Test/BaseEx.java
index 7ae42ef3bae9..086a946dfdf0 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 = 3897763621745163045L;
+    private static final long serialVersionUID = 3897766966800812805L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/C.java b/slice2java/swift/test/Ice/objects/Test/C.java
index 8c44b1dbaace..78869475c0d7 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 = 3225520889382432680L;
+    private static final long serialVersionUID = 3229569847594981119L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/COneMember.java b/slice2java/swift/test/Ice/objects/Test/COneMember.java
index b18e4c6e4d65..5cb3a3ce1cd3 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 = 3050977139600400498L;
+    private static final long serialVersionUID = 3050969862033809556L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java
index aa9ffad86634..448e68c9637a 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 = -1241987997385943269L;
+    private static final long serialVersionUID = -6188999916786012133L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/D.java b/slice2java/swift/test/Ice/objects/Test/D.java
index 64c3bc48f851..14a4a379f68a 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 = 4725061052696227312L;
+    private static final long serialVersionUID = -6173523181290423496L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/D1.java b/slice2java/swift/test/Ice/objects/Test/D1.java
index 49b15c75be6f..638eccd37ba5 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 = -1635139384838643517L;
+    private static final long serialVersionUID = -4424998774875256957L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Derived.java b/slice2java/swift/test/Ice/objects/Test/Derived.java
index 700c45195b03..92928c32607f 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 = -1587931948995107417L;
+    private static final long serialVersionUID = -1587926937949640203L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/E.java b/slice2java/swift/test/Ice/objects/Test/E.java
index 9ac1bd9a2b1f..840de5760b8f 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 = -5658335572677138149L;
+    private static final long serialVersionUID = -2995363975325661601L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/EBase.java b/slice2java/swift/test/Ice/objects/Test/EBase.java
index 0910825a2673..0f97c870acba 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 = 7835415805014414414L;
+    private static final long serialVersionUID = -3848779210183608306L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/EDerived.java b/slice2java/swift/test/Ice/objects/Test/EDerived.java
index 55ad358a9d96..d6404844d06d 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 = 2077075360268582994L;
+    private static final long serialVersionUID = -1284035702463654126L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/EOneMember.java b/slice2java/swift/test/Ice/objects/Test/EOneMember.java
index f405cc1c5569..014f15316647 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 = -6225292283088402243L;
+    private static final long serialVersionUID = -6225291783145573349L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java
index fb53953ecc61..d0457afee330 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 = 4713564122457537940L;
+    private static final long serialVersionUID = 5947983434445977492L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/F.java b/slice2java/swift/test/Ice/objects/Test/F.java
index ba5eba4802c6..5137854caf6c 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 = -1601770192803276079L;
+    private static final long serialVersionUID = 6931940576412729553L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/F1.java b/slice2java/swift/test/Ice/objects/Test/F1.java
index 0a8f9ecc9e98..44ba3baa524d 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 = 6192369658272485852L;
+    private static final long serialVersionUID = 6192365966058339774L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/F3.java b/slice2java/swift/test/Ice/objects/Test/F3.java
index 231a48774c05..2298003619d9 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 = -8842321789912472829L;
+    private static final long serialVersionUID = -618026991793621766L;
 
     /** @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 fad8a62cf8be..0fc61044cd08 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 = -1425260915769651899L;
+    private static final long serialVersionUID = -1425257735956925003L;
 
     /** @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 8f70ac96815a..23adbe621833 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 = -2337229075745089330L;
+    private static final long serialVersionUID = -2337225978789008914L;
 }
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 a9342b8676f6..2b079bd5ebe0 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 = -1298679475083372613L;
+    private static final long serialVersionUID = -1298675959885750222L;
 
     /** @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 f41789c7cfcb..ddfdea7e0694 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 = 1842238228550599274L;
+    private static final long serialVersionUID = 1842241826582312202L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/K.java b/slice2java/swift/test/Ice/objects/Test/K.java
index 50a8d04aa83b..8f4bc1ad15b7 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 = 4645161878807776421L;
+    private static final long serialVersionUID = 4645159851361418945L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/L.java b/slice2java/swift/test/Ice/objects/Test/L.java
index df17329b19b2..4d9d4165170b 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 = 6629739409598932348L;
+    private static final long serialVersionUID = 6629735899396937756L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/M.java b/slice2java/swift/test/Ice/objects/Test/M.java
index 2c3c5dc3e2da..8eca692214ed 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 = -8088097532555333058L;
+    private static final long serialVersionUID = -8088100634655392102L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Recursive.java b/slice2java/swift/test/Ice/objects/Test/Recursive.java
index 472dac6c7ff3..3bd84830f3c2 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 = 3617877963909740544L;
+    private static final long serialVersionUID = 3617875605840110750L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/S.java b/slice2java/swift/test/Ice/objects/Test/S.java
index c210a0250481..00489639485b 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 = 481772058201061455L;
+    private static final long serialVersionUID = 481769622351964591L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/SOneMember.java b/slice2java/swift/test/Ice/objects/Test/SOneMember.java
index d6487d3328dc..885877b28a9e 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 = 6227753053891777579L;
+    private static final long serialVersionUID = 6227760816917619213L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java
index b2bfcec3fc0e..77560f13c74d 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 = 1474344858709048066L;
+    private static final long serialVersionUID = -8101939604441179390L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/StructKey.java b/slice2java/swift/test/Ice/objects/Test/StructKey.java
index 4ec62538f191..30ac91dd2712 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 = -3091333649364668969L;
+    private static final long serialVersionUID = -8195989536880340461L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java
index 1da0fed99cf9..3a1c9d704d11 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 = 2723846672887569646L;
+    private static final long serialVersionUID = 2723850672483749722L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/MyClass1.java b/slice2java/swift/test/Ice/operations/Test/MyClass1.java
index 4d565c67b31a..023b0e23b754 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 = -3200859161316920164L;
+    private static final long serialVersionUID = -3928455549109047041L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct.java b/slice2java/swift/test/Ice/operations/Test/MyStruct.java
index 34c5ec13afcf..da118e71894d 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 = 733043380678647677L;
+    private static final long serialVersionUID = 7386871508370969981L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java
index 2cc957ad25f5..1152f56fedcc 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 = -3853664436013977451L;
+    private static final long serialVersionUID = 3128343847618888278L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/Structure.java b/slice2java/swift/test/Ice/operations/Test/Structure.java
index d0cfce231350..61440f1db1e6 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 = 2960547252456861462L;
+    private static final long serialVersionUID = -7927887775194226795L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/A.java b/slice2java/swift/test/Ice/optional/Test/A.java
index 3511b81b924b..480da94ff905 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 = -4716665618487107056L;
+    private static final long serialVersionUID = -1674574019286423280L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/B.java b/slice2java/swift/test/Ice/optional/Test/B.java
index a81abcd1bc57..8e381002995f 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 = 6755210109122615907L;
+    private static final long serialVersionUID = -5592425380749049885L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/C.java b/slice2java/swift/test/Ice/optional/Test/C.java
index 01f1c3ecf3a5..f36acf2eb635 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 = -3409397621771023363L;
+    private static final long serialVersionUID = -8898950624614231491L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/DerivedException.java b/slice2java/swift/test/Ice/optional/Test/DerivedException.java
index f0a8a8f8a607..ddf6390429e7 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 = -601614201421792446L;
+    private static final long serialVersionUID = -1089549727663110358L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/E.java b/slice2java/swift/test/Ice/optional/Test/E.java
index fd77d015a30c..1a9fc0fd0c39 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 = -1850742695226764638L;
+    private static final long serialVersionUID = -1850731346004063766L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/F.java b/slice2java/swift/test/Ice/optional/Test/F.java
index 4c9559b6c2d6..2ca9ff1dcc89 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 = -6430489589940491311L;
+    private static final long serialVersionUID = -6430490018496238823L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java
index 6b4d6a92c425..88f815358cb0 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 = 1569604700757616991L;
+    private static final long serialVersionUID = 1569609476758594571L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/G.java b/slice2java/swift/test/Ice/optional/Test/G.java
index 473537ab6ae4..629d037902f4 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 = 7429360482774122963L;
+    private static final long serialVersionUID = -1890748817421031725L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/G1.java b/slice2java/swift/test/Ice/optional/Test/G1.java
index a7b5cca61b95..02b39608829b 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 = 7339781121646998988L;
+    private static final long serialVersionUID = 7339787411040757092L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/G2.java b/slice2java/swift/test/Ice/optional/Test/G2.java
index 89e6296671da..6d8b22d09bbf 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 = 3824547918121230428L;
+    private static final long serialVersionUID = 3824559246678539513L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java
index 9d5c2b9824dd..8a4fdd9e639d 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 = 7453382213440042874L;
+    private static final long serialVersionUID = -4065198885721858900L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/OneOptional.java b/slice2java/swift/test/Ice/optional/Test/OneOptional.java
index fdf541b32107..5fd7b2510ae3 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 = -7219601176648308623L;
+    private static final long serialVersionUID = -7219607321442935515L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalException.java b/slice2java/swift/test/Ice/optional/Test/OptionalException.java
index b6dc5530c8d6..a8b8f85d3ab9 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 = -5112794865695978417L;
+    private static final long serialVersionUID = -7452627549874847973L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java
index c82e4c0fbeed..f0228850118c 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 = -6999864782819813957L;
+    private static final long serialVersionUID = 1357931976647211195L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/RequiredException.java b/slice2java/swift/test/Ice/optional/Test/RequiredException.java
index 96009baef00b..34b3fbb8f5cd 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 = 2894235142524210181L;
+    private static final long serialVersionUID = 2894241367351544941L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java
index 950936b854dd..b0921cf675a3 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 = 6700991149093727484L;
+    private static final long serialVersionUID = 6700995989584875030L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/VarStruct.java b/slice2java/swift/test/Ice/optional/Test/VarStruct.java
index b2355f5a8620..59df6289a6ce 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 = -1912287745937162428L;
+    private static final long serialVersionUID = -1912281435879917844L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/WD.java b/slice2java/swift/test/Ice/optional/Test/WD.java
index f4527576d276..2c1a4bff92b7 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 = 8149225652420888221L;
+    private static final long serialVersionUID = 7557599272899382817L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C.java b/slice2java/swift/test/Ice/scope/Test/C.java
index 6b5d79dfda6c..4230fb1effb2 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 = -5190248370370977770L;
+    private static final long serialVersionUID = -5190249902052389753L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C1.java b/slice2java/swift/test/Ice/scope/Test/C1.java
index a1659c23ea0f..d744c8badcdb 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 = 8893234794347092660L;
+    private static final long serialVersionUID = 8893230530081721447L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C2.java b/slice2java/swift/test/Ice/scope/Test/C2.java
index 9e7b9c901a9b..bc03de743546 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 = 1493501599461028026L;
+    private static final long serialVersionUID = -6787667823273049841L;
 
     /** @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 0467e85d95f2..643dee0c0d0d 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 = 4615626747826192559L;
+    private static final long serialVersionUID = 4615625552079659567L;
 
     /** @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 b15239cd3cd3..5e795400d76c 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 = 672593438560663098L;
+    private static final long serialVersionUID = 672580660926523895L;
 
     /** @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 7e0e4518546b..bb814709965e 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 = 8654437674900608506L;
+    private static final long serialVersionUID = 8654442104625507497L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/S.java
index de793febd227..29c91ea5e9c0 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 = 3694620503760070838L;
+    private static final long serialVersionUID = 3694613351614590181L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S.java b/slice2java/swift/test/Ice/scope/Test/S.java
index 15b4181f3b5b..085ab01857ea 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 = 2159701028762656776L;
+    private static final long serialVersionUID = 2159705453330084955L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S1.java b/slice2java/swift/test/Ice/scope/Test/S1.java
index ff6549a46aae..48c6bb091746 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 = 1241678605983320717L;
+    private static final long serialVersionUID = 1241672130548264158L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S2.java b/slice2java/swift/test/Ice/scope/Test/S2.java
index 84dfb76f5cdc..614dfda53ac9 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 = -2353454748719581117L;
+    private static final long serialVersionUID = -3180889646715237002L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java
index 06acabb2b164..e1cd1bd4096d 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 = -477021394792304819L;
+    private static final long serialVersionUID = -477023724453203219L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java
index ab06924c1f0a..7e6d516d017f 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 = 3485211380805858539L;
+    private static final long serialVersionUID = 3485214180695144715L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 9c4a0baabc2f..06161b2a58b5 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 = 1717374825696867610L;
+    private static final long serialVersionUID = 1717378002693437562L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index e9785d3c7df8..0078651612a2 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 = -7384920922665192381L;
+    private static final long serialVersionUID = -7384918639187856285L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index 22e3c8dc778b..032595f76e2d 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 = 3424382437006558355L;
+    private static final long serialVersionUID = 3424380244098667685L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index e97a467bc95d..82cfa99eb017 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 = -1172594529005377854L;
+    private static final long serialVersionUID = -1172597956717759948L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 93af498a2796..94f45c63a1c3 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 = -1126112580535725765L;
+    private static final long serialVersionUID = -1126109313126391219L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index 3da1ed17432a..f57aa163937c 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 = -2097571300392160613L;
+    private static final long serialVersionUID = -2097573493300051283L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/B.java b/slice2java/swift/test/Ice/slicing/objects/Test/B.java
index 5d9d3dc61582..37c2270697f3 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 = -4686775445036244426L;
+    private static final long serialVersionUID = 4971068648537339434L;
 
     /** @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 c456c784645b..c7e1ca346888 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 = -9067733326990273158L;
+    private static final long serialVersionUID = 4231865033972848870L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 0c44ea597a9e..4e41e54c4aa1 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 = -6397006129540357117L;
+    private static final long serialVersionUID = -6396997844730093835L;
 
     /** @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 c423ce38297d..59bc57f0a427 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 = -9066880535281739031L;
+    private static final long serialVersionUID = -9066887936607947205L;
 
     /** @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 e33b995e1c02..620018263972 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 = -1195429598566105803L;
+    private static final long serialVersionUID = 3555434918430629545L;
 
     /** @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 9e78e9f9b29a..ece72e322599 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 = 8174924036840245296L;
+    private static final long serialVersionUID = -212424004987087195L;
 
     /** @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 2451c23903dc..807b180e5a8f 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 = 4764187547110996625L;
+    private static final long serialVersionUID = 7206065123322024757L;
 
     /** @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 85d4205be6f0..fcfe1e492ea9 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 = -8168009958008696845L;
+    private static final long serialVersionUID = 6062181832836609267L;
 
     /** @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 499aa00729b9..d1d99bbbfb44 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 = 6769125058132617038L;
+    private static final long serialVersionUID = -2113046970886633879L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java
index fb80b4deeaa9..4e720ffb249e 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 = -7655923699524359550L;
+    private static final long serialVersionUID = -7655927218902116575L;
 
     /** @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 7d79830eb5a0..fc1a87c59682 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 = -2271128160322119606L;
+    private static final long serialVersionUID = -2271124806616246563L;
 
     /** @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 c732df7aaa82..4d48a1643a45 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 = 4147524763119233206L;
+    private static final long serialVersionUID = 4147528676219058031L;
 
     /** @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 6135b5c1ab05..14aa563ad04c 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 = 481713891889079493L;
+    private static final long serialVersionUID = 481712947862422666L;
 
     /** @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 d2e809b4cb50..57170f64aad0 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 = -4426891156376012349L;
+    private static final long serialVersionUID = -4426883036868910027L;
 
     /** @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 559d13245914..459a9c40bf3f 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 = 850542701432044374L;
+    private static final long serialVersionUID = 850540037161326310L;
 
     /** @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 273f14954139..a94adcbf890e 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 = -4328900011932418310L;
+    private static final long serialVersionUID = -4328908092608916617L;
 
     /** @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 2cec0d0a44ce..5400d9428459 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 = -5081814627597413885L;
+    private static final long serialVersionUID = -5081806546951849703L;
 
     /** @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 ca1c865b5976..31c5d3c4b8df 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 = 643085531164043310L;
+    private static final long serialVersionUID = 643086320168567932L;
 
     /** @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 8d85282098da..3c2bcd0f7606 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 = -2438013836257964192L;
+    private static final long serialVersionUID = -2438001145049062645L;
 
     /** @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 8da953583d75..ea9e75bd7b0e 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 = -4752818761367793134L;
+    private static final long serialVersionUID = -8159561511781746121L;
 
     /** @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 2782e584d99c..71267932cfb8 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 = -8813708037022603240L;
+    private static final long serialVersionUID = -8813709540243438377L;
 
     /** @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 1ff6f75a129e..2db4741a9fab 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 = 3651529272963213904L;
+    private static final long serialVersionUID = 3651532626831389580L;
 
     /** @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 e53039fd2cf4..756bad48500a 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 = 8804382324991288565L;
+    private static final long serialVersionUID = 8804372524134928041L;
 
     /** @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 e22ca4b038fd..e0a06e66e1fb 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 = -4989057694587693992L;
+    private static final long serialVersionUID = -4989067062744089757L;
 
     /** @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 3848610b8d2c..32f6cc5fadcc 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 = -5353761736399610109L;
+    private static final long serialVersionUID = -5353754665680660257L;
 
     /** @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 09a2c1f3abbd..cff18cb1c23b 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 = -6522139909416334605L;
+    private static final long serialVersionUID = -6522141690226845124L;
 
     /** @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 a48f7c3f7e3e..d896f6a6b274 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 = 7620288007488176944L;
+    private static final long serialVersionUID = 7620283496519197823L;
 
     /** @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 ffe182c8e694..2cf5e2c2aabe 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 = 1772759220496445789L;
+    private static final long serialVersionUID = 6163154194715078810L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java
index 3b5615660a36..2fab60040bb6 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 = -939777452252269145L;
+    private static final long serialVersionUID = 3188916736723188050L;
 
     /** @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 c8cb6e0294b7..ac9bb2dbc479 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 = 503413393755764355L;
+    private static final long serialVersionUID = -3279994669838664160L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java
index 85faa998793a..cac5f782c8d9 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 = -1422746272583415903L;
+    private static final long serialVersionUID = -6747477629369823568L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/MyClass.java b/slice2java/swift/test/Ice/stream/Test/MyClass.java
index b825f4ce02ab..338061232451 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 = 7703453995335994651L;
+    private static final long serialVersionUID = -5230282338717610092L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/stream/Test/MyException.java b/slice2java/swift/test/Ice/stream/Test/MyException.java
index 9fc648b1e33f..7b929b6a8a80 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 = 5734225176716488976L;
+    private static final long serialVersionUID = 5734227207072449468L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java
index 23564f468683..afea40da935b 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 = 6655472703489390315L;
+    private static final long serialVersionUID = -3806109283775512469L;
 
     /** @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 429d6c1e498b..9281a998e6a0 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 = -1404702705329081380L;
+    private static final long serialVersionUID = -1404700408937375892L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java
index 691942d14e7a..2e3530c3700b 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 = -5988301550786071986L;
+    private static final long serialVersionUID = -8102822937811092616L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java
index b8765b06da2b..a521dccdcc49 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 = -8562123889542620114L;
+    private static final long serialVersionUID = -8562126095508435106L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java
index 123662caab5d..d180bd395237 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 = -282763534798693191L;
+    private static final long serialVersionUID = -244823064265757937L;
 }
diff --git a/slice2java/swift/test/Slice/escape/Clash/Cls.java b/slice2java/swift/test/Slice/escape/Clash/Cls.java
index 653aa7bf099f..9854132e504c 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 = -5660832829694920479L;
+    private static final long serialVersionUID = -6495303564218623461L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Slice/escape/Clash/Ex.java b/slice2java/swift/test/Slice/escape/Clash/Ex.java
index cfd8ffe1d410..b064a999613e 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 = 2281756871460950871L;
+    private static final long serialVersionUID = -1005772357450514013L;
 }
diff --git a/slice2java/swift/test/Slice/escape/Clash/St.java b/slice2java/swift/test/Slice/escape/Clash/St.java
index 118ff76a14bf..11281f670b87 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 = 4334911810016274717L;
+    private static final long serialVersionUID = 442616650143012323L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/_return.java b/slice2java/swift/test/Slice/escape/and/_return.java
index 11ed62489d2e..c2229e1de142 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 = -8206187278008230489L;
+    private static final long serialVersionUID = -8206186898476069387L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/_switch.java b/slice2java/swift/test/Slice/escape/and/_switch.java
index 748b95175ee6..5fb96381430d 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 = 9067632533711511435L;
+    private static final long serialVersionUID = 3119453826779170112L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Slice/escape/and/as.java b/slice2java/swift/test/Slice/escape/and/as.java
index b0ca288bcf28..8e023a75b874 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 = -73503060251499016L;
+    private static final long serialVersionUID = -233197808661280136L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/defer.java b/slice2java/swift/test/Slice/escape/and/defer.java
index 6b102a1c6a3e..17be73e7975e 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 = 8824798716798504009L;
+    private static final long serialVersionUID = 8824799024144565522L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/guard.java b/slice2java/swift/test/Slice/escape/and/guard.java
index 306bd9f13d64..c427cacf929e 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 = 6403717689679717457L;
+    private static final long serialVersionUID = 6403717909374388867L;
 }