diff --git a/slice2cpp/cpp/src/IceGrid/Internal.cpp b/slice2cpp/cpp/src/IceGrid/Internal.cpp
index 80ec7165fb41..26452515bb89 100644
--- a/slice2cpp/cpp/src/IceGrid/Internal.cpp
+++ b/slice2cpp/cpp/src/IceGrid/Internal.cpp
@@ -1700,11 +1700,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerNode(const ::std::shared_ptr<::IceIn
             {
                 ex.ice_throw();
             }
-            catch(const NodeActiveException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
-            catch(const PermissionDeniedException&)
+            catch(const NodeActiveException&)
             {
                 throw;
             }
@@ -1750,11 +1750,11 @@ IceGrid::InternalRegistryPrx::_iceI_registerReplica(const ::std::shared_ptr<::Ic
             {
                 ex.ice_throw();
             }
-            catch(const ReplicaActiveException&)
+            catch(const PermissionDeniedException&)
             {
                 throw;
             }
-            catch(const PermissionDeniedException&)
+            catch(const ReplicaActiveException&)
             {
                 throw;
             }
diff --git a/slice2cpp/slice/IceGrid/Admin.cpp b/slice2cpp/slice/IceGrid/Admin.cpp
index 72c05fa92722..9ae2eebc5ec1 100644
--- a/slice2cpp/slice/IceGrid/Admin.cpp
+++ b/slice2cpp/slice/IceGrid/Admin.cpp
@@ -3206,19 +3206,19 @@ IceGrid::AdminSessionPrx::_iceI_openServerLog(const ::std::shared_ptr<::IceInter
             {
                 ex.ice_throw();
             }
-            catch(const ServerNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ServerNotExistException&)
             {
                 throw;
             }
-            catch(const NodeUnreachableException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const NodeUnreachableException&)
             {
                 throw;
             }
@@ -3263,19 +3263,19 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdErr(const ::std::shared_ptr<::IceIn
             {
                 ex.ice_throw();
             }
-            catch(const ServerNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ServerNotExistException&)
             {
                 throw;
             }
-            catch(const NodeUnreachableException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const NodeUnreachableException&)
             {
                 throw;
             }
@@ -3320,19 +3320,19 @@ IceGrid::AdminSessionPrx::_iceI_openServerStdOut(const ::std::shared_ptr<::IceIn
             {
                 ex.ice_throw();
             }
-            catch(const ServerNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const DeploymentException&)
+            catch(const ServerNotExistException&)
             {
                 throw;
             }
-            catch(const NodeUnreachableException&)
+            catch(const DeploymentException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const NodeUnreachableException&)
             {
                 throw;
             }
@@ -3377,15 +3377,15 @@ IceGrid::AdminSessionPrx::_iceI_openNodeStdErr(const ::std::shared_ptr<::IceInte
             {
                 ex.ice_throw();
             }
-            catch(const NodeNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const NodeUnreachableException&)
+            catch(const NodeNotExistException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const NodeUnreachableException&)
             {
                 throw;
             }
@@ -3430,15 +3430,15 @@ IceGrid::AdminSessionPrx::_iceI_openNodeStdOut(const ::std::shared_ptr<::IceInte
             {
                 ex.ice_throw();
             }
-            catch(const NodeNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const NodeUnreachableException&)
+            catch(const NodeNotExistException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const NodeUnreachableException&)
             {
                 throw;
             }
@@ -3483,15 +3483,15 @@ IceGrid::AdminSessionPrx::_iceI_openRegistryStdErr(const ::std::shared_ptr<::Ice
             {
                 ex.ice_throw();
             }
-            catch(const RegistryNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const RegistryUnreachableException&)
+            catch(const RegistryNotExistException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const RegistryUnreachableException&)
             {
                 throw;
             }
@@ -3536,15 +3536,15 @@ IceGrid::AdminSessionPrx::_iceI_openRegistryStdOut(const ::std::shared_ptr<::Ice
             {
                 ex.ice_throw();
             }
-            catch(const RegistryNotExistException&)
+            catch(const FileNotAvailableException&)
             {
                 throw;
             }
-            catch(const RegistryUnreachableException&)
+            catch(const RegistryNotExistException&)
             {
                 throw;
             }
-            catch(const FileNotAvailableException&)
+            catch(const RegistryUnreachableException&)
             {
                 throw;
             }
diff --git a/slice2cs/cpp/src/IceGrid/Internal.cs b/slice2cs/cpp/src/IceGrid/Internal.cs
index bcbebd013f78..5a7c171a251e 100644
--- a/slice2cs/cpp/src/IceGrid/Internal.cs
+++ b/slice2cs/cpp/src/IceGrid/Internal.cs
@@ -6305,11 +6305,11 @@ private void _iceI_registerNode(InternalNodeInfo? iceP_info, NodePrx? iceP_prx,
                     {
                         throw ex;
                     }
-                    catch(PermissionDeniedException)
+                    catch(NodeActiveException)
                     {
                         throw;
                     }
-                    catch(NodeActiveException)
+                    catch(PermissionDeniedException)
                     {
                         throw;
                     }
@@ -6361,11 +6361,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/cpp/test/Ice/operations/Test.cs b/slice2cs/cpp/test/Ice/operations/Test.cs
index 0b2d17d29f79..09e8ed685c09 100644
--- a/slice2cs/cpp/test/Ice/operations/Test.cs
+++ b/slice2cs/cpp/test/Ice/operations/Test.cs
@@ -13946,66 +13946,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current);
 
-        public abstract void shutdown(Ice.Current current);
-
-        public abstract bool supportsCompress(Ice.Current current);
-
-        public abstract void opVoid(Ice.Current current);
-
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
-
-        public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
-
-        public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
-
-        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
-
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
-
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
-
-        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
-
-        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
-
-        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
-
-        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
-
-        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
-
-        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
-
-        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
-
-        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, MyEnum> p1, global::System.Collections.Generic.Dictionary<string, MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<MyEnum, string> p1, global::System.Collections.Generic.Dictionary<MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<MyEnum, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p2, out global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
-
         public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
@@ -14086,6 +14026,66 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+        public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
+
+        public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
+
+        public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
+
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
+
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
+        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
+
+        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+
+        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+
+        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+
+        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+
+        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
+
+        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
+
+        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, MyEnum> p1, global::System.Collections.Generic.Dictionary<string, MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<MyEnum, string> p1, global::System.Collections.Generic.Dictionary<MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<MyEnum, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p2, out global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -14181,66 +14181,6 @@ namespace Test2
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")]
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
-        public abstract void shutdown(Ice.Current current);
-
-        public abstract bool supportsCompress(Ice.Current current);
-
-        public abstract void opVoid(Ice.Current current);
-
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current);
-
-        public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current);
-
-        public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current);
-
-        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
-
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
-
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
-
-        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
-
-        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
-
-        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
-
-        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
-
-        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
-
-        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
-
-        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
-
-        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
-
         public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
@@ -14321,6 +14261,66 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+        public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current);
+
+        public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current);
+
+        public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current);
+
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
+
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
+        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
+
+        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+
+        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+
+        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+
+        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+
+        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
+
+        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
+
+        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";
diff --git a/slice2cs/cpp/test/Ice/operations/TestAMD.cs b/slice2cs/cpp/test/Ice/operations/TestAMD.cs
index a4e5b7751777..05b967bb6686 100644
--- a/slice2cs/cpp/test/Ice/operations/TestAMD.cs
+++ b/slice2cs/cpp/test/Ice/operations/TestAMD.cs
@@ -10333,6 +10333,26 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyStruct1> opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current);
 
+        public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteResult> opByteAsync(byte p1, byte p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolResult> opBoolAsync(bool p1, bool p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongResult> opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleResult> opFloatDoubleAsync(float p1, double p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringResult> opStringAsync(string p1, string p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumResult> opMyEnumAsync(MyEnum p1, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyClassResult> opMyClassAsync(MyClassPrx? p1, Ice.Current current);
+
         public abstract global::System.Threading.Tasks.Task<MyClass_OpStructResult> opStructAsync(Structure p1, Structure p2, Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSResult> opByteSAsync(byte[] p1, byte[] p2, Ice.Current current);
@@ -10453,26 +10473,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
-        public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteResult> opByteAsync(byte p1, byte p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolResult> opBoolAsync(bool p1, bool p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongResult> opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleResult> opFloatDoubleAsync(float p1, double p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringResult> opStringAsync(string p1, string p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumResult> opMyEnumAsync(MyEnum p1, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyClassResult> opMyClassAsync(MyClassPrx? p1, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
diff --git a/slice2cs/csharp/test/Ice/operations/TestAMD.cs b/slice2cs/csharp/test/Ice/operations/TestAMD.cs
index daec9c05d31a..490e41cb1dc7 100644
--- a/slice2cs/csharp/test/Ice/operations/TestAMD.cs
+++ b/slice2cs/csharp/test/Ice/operations/TestAMD.cs
@@ -10235,26 +10235,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumMyEnumSDResult> opMyEnumMyEnumSDAsync(global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p1, global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p2, Ice.Current current);
 
-            public abstract global::System.Threading.Tasks.Task<string[]> opStringS2Async(string[] stringS, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<global::System.Collections.Generic.Dictionary<byte, bool>> opByteBoolD2Async(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<string[]> opStringLiteralsAsync(Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<string[]> opWStringLiteralsAsync(Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct1MarshaledResult> opMStruct1Async(Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct2MarshaledResult> opMStruct2Async(Structure p1, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq1MarshaledResult> opMSeq1Async(Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq2MarshaledResult> opMSeq2Async(string[] p1, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict1MarshaledResult> opMDict1Async(Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
-
             public abstract global::System.Threading.Tasks.Task<int[]> opIntSAsync(int[] s, Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task opByteSOnewayAsync(byte[] s, Ice.Current current);
@@ -10285,6 +10265,26 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<global::System.Collections.Generic.Dictionary<byte, bool>> opByteBoolD1Async(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
 
+            public abstract global::System.Threading.Tasks.Task<string[]> opStringS2Async(string[] stringS, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<global::System.Collections.Generic.Dictionary<byte, bool>> opByteBoolD2Async(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<string[]> opStringLiteralsAsync(Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<string[]> opWStringLiteralsAsync(Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct1MarshaledResult> opMStruct1Async(Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct2MarshaledResult> opMStruct2Async(Structure p1, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq1MarshaledResult> opMSeq1Async(Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq2MarshaledResult> opMSeq2Async(string[] p1, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict1MarshaledResult> opMDict1Async(Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
+
             public override string ice_id(Ice.Current current) => ice_staticId();
 
             public static new string ice_staticId() => "::Test::MyDerivedClass";
diff --git a/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs b/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs
index 804228730483..24cb30ffe647 100644
--- a/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs
+++ b/slice2cs/java/test/src/main/java/test/Ice/operations/TestAMD.cs
@@ -10131,20 +10131,6 @@ 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<string[]> opWStringLiteralsAsync(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct1MarshaledResult> opMStruct1Async(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct2MarshaledResult> opMStruct2Async(Structure p1, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq1MarshaledResult> opMSeq1Async(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq2MarshaledResult> opMSeq2Async(string[] p1, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict1MarshaledResult> opMDict1Async(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
-
         public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
@@ -10271,6 +10257,20 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<string[]> opStringLiteralsAsync(Ice.Current current);
 
+        public abstract global::System.Threading.Tasks.Task<string[]> opWStringLiteralsAsync(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct1MarshaledResult> opMStruct1Async(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct2MarshaledResult> opMStruct2Async(Structure p1, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq1MarshaledResult> opMSeq1Async(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq2MarshaledResult> opMSeq2Async(string[] p1, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict1MarshaledResult> opMDict1Async(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
diff --git a/slice2cs/js/test/Ice/operations/Test.cs b/slice2cs/js/test/Ice/operations/Test.cs
index 83daad986c9f..308fe34c43a7 100644
--- a/slice2cs/js/test/Ice/operations/Test.cs
+++ b/slice2cs/js/test/Ice/operations/Test.cs
@@ -14013,15 +14013,35 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current);
 
-        public abstract void shutdown(Ice.Current current);
+        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
 
-        public abstract bool supportsCompress(Ice.Current current);
+        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
 
-        public abstract void opVoid(Ice.Current current);
+        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out 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<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
 
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, MyEnum> p1, global::System.Collections.Generic.Dictionary<string, MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<MyEnum, string> p1, global::System.Collections.Generic.Dictionary<MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<MyEnum, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p2, out global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, MyEnum>[] p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<MyEnum, string>[] p3, Ice.Current current);
 
@@ -14095,6 +14115,16 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
         public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
 
         public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
@@ -14123,36 +14153,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
 
-        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
-
-        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
-
-        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, MyEnum> p1, global::System.Collections.Generic.Dictionary<string, MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<MyEnum, string> p1, global::System.Collections.Generic.Dictionary<MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<MyEnum, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p2, out global::System.Collections.Generic.Dictionary<MyStruct, MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, MyEnum>[] p3, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -14282,15 +14282,35 @@ namespace Test2
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")]
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
-        public abstract void shutdown(Ice.Current current);
+        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
 
-        public abstract bool supportsCompress(Ice.Current current);
+        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
 
-        public abstract void opVoid(Ice.Current current);
+        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out 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<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
 
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] p3, Ice.Current current);
 
@@ -14364,6 +14384,16 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
         public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
 
         public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
@@ -14392,36 +14422,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
 
-        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
-
-        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
-
-        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> opStringMyEnumD(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> opMyEnumStringD(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> opMyStructMyEnumD(global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p1, global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p2, out global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool>[] opByteBoolDS(global::System.Collections.Generic.Dictionary<byte, bool>[] p1, global::System.Collections.Generic.Dictionary<byte, bool>[] p2, out global::System.Collections.Generic.Dictionary<byte, bool>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, global::Test.MyEnum>[] p3, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";
diff --git a/slice2cs/php/test/Ice/operations/Test.cs b/slice2cs/php/test/Ice/operations/Test.cs
index ddb17119aac0..8d1e8ea5041f 100644
--- a/slice2cs/php/test/Ice/operations/Test.cs
+++ b/slice2cs/php/test/Ice/operations/Test.cs
@@ -12486,50 +12486,12 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
-        public abstract void shutdown(Ice.Current current);
-
-        public abstract bool supportsCompress(Ice.Current current);
-
-        public abstract void opVoid(Ice.Current current);
-
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
-
-        public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
-
-        public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
-
-        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
-
-        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
-
-        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
-
-        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
-
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
-
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
-
-        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
-
-        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
-
         public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
 
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
         public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
@@ -12610,6 +12572,44 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+        public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
+
+        public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
+
+        public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
+
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
+
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
+        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
+
+        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+
+        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+
+        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+
+        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -12700,50 +12700,12 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
         public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
-
-        public abstract void shutdown(Ice.Current current);
-
-        public abstract bool supportsCompress(Ice.Current current);
-
-        public abstract void opVoid(Ice.Current current);
-
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current);
-
-        public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current);
-
-        public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current);
-
-        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
-
-        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
-
-        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
-
-        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
-
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
-
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
-
-        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
-
-        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
-
         public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
 
+        public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
+
         public abstract global::System.Collections.Generic.Dictionary<long, float> opLongFloatD(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, out global::System.Collections.Generic.Dictionary<long, float> p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<string, string> opStringStringD(global::System.Collections.Generic.Dictionary<string, string> p1, global::System.Collections.Generic.Dictionary<string, string> p2, out global::System.Collections.Generic.Dictionary<string, string> p3, Ice.Current current);
@@ -12824,6 +12786,44 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+        public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current);
+
+        public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current);
+
+        public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current);
+
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
+
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
+        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
+
+        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+
+        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+
+        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+
+        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";
diff --git a/slice2cs/python/test/Ice/operations/Test.cs b/slice2cs/python/test/Ice/operations/Test.cs
index 3b65c7a0c700..bc149ddc0710 100644
--- a/slice2cs/python/test/Ice/operations/Test.cs
+++ b/slice2cs/python/test/Ice/operations/Test.cs
@@ -13665,6 +13665,20 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current);
 
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
+        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
+
+        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+
+        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+
+        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+
+        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+
         public abstract void shutdown(Ice.Current current);
 
         public abstract bool supportsCompress(Ice.Current current);
@@ -13689,19 +13703,27 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
 
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
 
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+        public abstract string[] opStringS2(string[] stringS, Ice.Current current);
 
-        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, 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[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+        public abstract string[] opStringLiterals(Ice.Current current);
 
-        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+        public abstract string[] opWStringLiterals(Ice.Current current);
 
-        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+        public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
 
-        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+        public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current);
+
+        public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
+
+        public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
+
+        public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
+
+        public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
         public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
 
@@ -13783,28 +13805,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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 MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
-
-        public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
-
-        public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -13900,6 +13900,20 @@ namespace Test2
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")]
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
+        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
+
+        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+
+        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+
+        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+
+        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+
         public abstract void shutdown(Ice.Current current);
 
         public abstract bool supportsCompress(Ice.Current current);
@@ -13924,19 +13938,27 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
 
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
 
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+        public abstract string[] opStringS2(string[] stringS, Ice.Current current);
 
-        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, 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[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+        public abstract string[] opStringLiterals(Ice.Current current);
 
-        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+        public abstract string[] opWStringLiterals(Ice.Current current);
 
-        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+        public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
 
-        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+        public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
+
+        public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
         public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
 
@@ -14018,28 +14040,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         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::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
-
-        public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
-
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";
diff --git a/slice2cs/ruby/test/Ice/operations/Test.cs b/slice2cs/ruby/test/Ice/operations/Test.cs
index 522aeaaa543e..b1d73926d547 100644
--- a/slice2cs/ruby/test/Ice/operations/Test.cs
+++ b/slice2cs/ruby/test/Ice/operations/Test.cs
@@ -13353,49 +13353,15 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current);
 
-        public abstract void shutdown(Ice.Current current);
-
-        public abstract bool supportsCompress(Ice.Current current);
-
-        public abstract void opVoid(Ice.Current current);
-
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
-
-        public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
-
-        public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
-
-        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
-
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
-
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
-
-        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
-
-        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
-
-        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
-
-        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+        public abstract 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 long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, 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 double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, 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 string[][] opStringSS(string[][] p1, string[][] p2, out string[][] 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 string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] 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);
 
@@ -13453,6 +13419,50 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+        public abstract MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
+
+        public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
+
+        public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
+
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
+
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
+        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
+
+        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+
+        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+
+        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+
+        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+
+        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
+
+        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
+
+        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
+
         public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
@@ -13479,16 +13489,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<MyEnum, string>[] p3, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, byte[]> opByteByteSD(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, out global::System.Collections.Generic.Dictionary<byte, byte[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<bool, bool[]> opBoolBoolSD(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, out global::System.Collections.Generic.Dictionary<bool, bool[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
-
-        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 override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
@@ -13582,49 +13582,15 @@ namespace Test2
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("slice2cs", "3.8.0-alpha.0")]
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
-        public abstract void shutdown(Ice.Current current);
-
-        public abstract bool supportsCompress(Ice.Current current);
-
-        public abstract void opVoid(Ice.Current current);
-
-        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
-
-        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
-
-        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
-
-        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
-
-        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
-
-        public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current);
-
-        public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current);
-
-        public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current);
-
-        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
-
-        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
-
-        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
-
-        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
-
-        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
-
-        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
-
-        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p3, Ice.Current current);
 
-        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, 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 double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, 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 string[][] opStringSS(string[][] p1, string[][] p2, out string[][] 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 string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] 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);
 
@@ -13682,6 +13648,50 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
+        public abstract void shutdown(Ice.Current current);
+
+        public abstract bool supportsCompress(Ice.Current current);
+
+        public abstract void opVoid(Ice.Current current);
+
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
+
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
+
+        public abstract long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
+
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
+
+        public abstract string opString(string p1, string p2, out string p3, Ice.Current current);
+
+        public abstract global::Test.MyEnum opMyEnum(global::Test.MyEnum p1, out global::Test.MyEnum p2, Ice.Current current);
+
+        public abstract global::Test.MyClassPrx? opMyClass(global::Test.MyClassPrx? p1, out global::Test.MyClassPrx? p2, out global::Test.MyClassPrx? p3, Ice.Current current);
+
+        public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current);
+
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
+
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
+
+        public abstract long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, out short[] p4, out int[] p5, out long[] p6, Ice.Current current);
+
+        public abstract double[] opFloatDoubleS(float[] p1, double[] p2, out float[] p3, out double[] p4, Ice.Current current);
+
+        public abstract string[] opStringS(string[] p1, string[] p2, out string[] p3, Ice.Current current);
+
+        public abstract byte[][] opByteSS(byte[][] p1, byte[][] p2, out byte[][] p3, Ice.Current current);
+
+        public abstract bool[][] opBoolSS(bool[][] p1, bool[][] p2, out bool[][] p3, Ice.Current current);
+
+        public abstract long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, out short[][] p4, out int[][] p5, out long[][] p6, Ice.Current current);
+
+        public abstract double[][] opFloatDoubleSS(float[][] p1, double[][] p2, out float[][] p3, out double[][] p4, Ice.Current current);
+
+        public abstract string[][] opStringSS(string[][] p1, string[][] p2, out string[][] p3, Ice.Current current);
+
+        public abstract string[][][] opStringSSS(string[][][] p1, string[][][] p2, out string[][][] p3, Ice.Current current);
+
         public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, out global::System.Collections.Generic.Dictionary<byte, bool> p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<short, int> opShortIntD(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, out global::System.Collections.Generic.Dictionary<short, int> p3, Ice.Current current);
@@ -13708,16 +13718,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<global::Test.MyEnum, string>[] p3, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, byte[]> opByteByteSD(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, out global::System.Collections.Generic.Dictionary<byte, byte[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<bool, bool[]> opBoolBoolSD(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, out global::System.Collections.Generic.Dictionary<bool, bool[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
-
-        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 override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test2::MyDerivedClass";
diff --git a/slice2cs/slice/IceGrid/Session.cs b/slice2cs/slice/IceGrid/Session.cs
index f5a3a7de77c1..70dd73dee5bc 100644
--- a/slice2cs/slice/IceGrid/Session.cs
+++ b/slice2cs/slice/IceGrid/Session.cs
@@ -397,11 +397,11 @@ private void _iceI_allocateObjectById(global::Ice.Identity iceP_id, global::Syst
                     {
                         throw ex;
                     }
-                    catch(ObjectNotRegisteredException)
+                    catch(AllocationException)
                     {
                         throw;
                     }
-                    catch(AllocationException)
+                    catch(ObjectNotRegisteredException)
                     {
                         throw;
                     }
@@ -501,11 +501,11 @@ private void _iceI_releaseObject(global::Ice.Identity iceP_id, global::System.Co
                     {
                         throw ex;
                     }
-                    catch(ObjectNotRegisteredException)
+                    catch(AllocationException)
                     {
                         throw;
                     }
-                    catch(AllocationException)
+                    catch(ObjectNotRegisteredException)
                     {
                         throw;
                     }
diff --git a/slice2cs/swift/test/Ice/operations/TestAMD.cs b/slice2cs/swift/test/Ice/operations/TestAMD.cs
index 4f3e8071462d..24cb30ffe647 100644
--- a/slice2cs/swift/test/Ice/operations/TestAMD.cs
+++ b/slice2cs/swift/test/Ice/operations/TestAMD.cs
@@ -10131,18 +10131,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyStruct1> opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current);
 
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct1MarshaledResult> opMStruct1Async(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct2MarshaledResult> opMStruct2Async(Structure p1, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq1MarshaledResult> opMSeq1Async(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq2MarshaledResult> opMSeq2Async(string[] p1, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict1MarshaledResult> opMDict1Async(Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
-
         public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
@@ -10271,6 +10259,18 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<string[]> opWStringLiteralsAsync(Ice.Current current);
 
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct1MarshaledResult> opMStruct1Async(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMStruct2MarshaledResult> opMStruct2Async(Structure p1, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq1MarshaledResult> opMSeq1Async(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMSeq2MarshaledResult> opMSeq2Async(string[] p1, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict1MarshaledResult> opMDict1Async(Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMDict2MarshaledResult> opMDict2Async(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
+
         public override string ice_id(Ice.Current current) => ice_staticId();
 
         public static new string ice_staticId() => "::Test::MyDerivedClass";
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java
index fda437695540..101334138096 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java
@@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3774317211950226581L;
+    private static final long serialVersionUID = 3774325536961954919L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java
index ac05b3e5c033..546149250d2f 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java
@@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7872703513647869474L;
+    private static final long serialVersionUID = 7872706383493926627L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java
index 2893882901ce..264d865f9626 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 = 4407088982018996088L;
+    private static final long serialVersionUID = -5748350006402388789L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java
index e72f259c1976..e146a7313b2c 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 = -7424373303032189619L;
+    private static final long serialVersionUID = 8090030674769633689L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
index 45d43f89848f..82b6d6d3a953 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
@@ -100,7 +100,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5643095276737212138L;
+    private static final long serialVersionUID = -1230491632989762676L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java
index a5bdec8c5555..829fa84c4d65 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 = 2807870420736994428L;
+    private static final long serialVersionUID = 565482445779089276L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java
index ea60947b802f..0de340e306ff 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 = -9066287785058575658L;
+    private static final long serialVersionUID = -1837543252325029780L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java
index 01e92d47512e..417c68bbe33a 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 = -6561649494480750766L;
+    private static final long serialVersionUID = -4813888123638052462L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java
index 3f36361c02ac..7815ce9abd9f 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 = 8573366240450507729L;
+    private static final long serialVersionUID = -734782748242548561L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java
index 340162524570..306a12e31be7 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 = -7299044505678589129L;
+    private static final long serialVersionUID = 8180667122478609486L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java
index 120c1c977350..71b684198996 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 = -4618379200538826213L;
+    private static final long serialVersionUID = 6591230968429989544L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java
index 797e36cafd2a..d4770e7afdee 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 = 2931995547053817311L;
+    private static final long serialVersionUID = 7547347944446451807L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java
index 67536f6c6f32..c793d4601a4c 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 = -8626777670698917587L;
+    private static final long serialVersionUID = 1856091996676987633L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java
index 938b64cf886f..f89bb95bd210 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 = -2293606696729450780L;
+    private static final long serialVersionUID = -411280766873040540L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java
index c9973acc102d..369e8132ade5 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 = 5472025105176575976L;
+    private static final long serialVersionUID = 7810816339004459382L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java
index babe7abeff9f..dfbb0eed6d77 100644
--- a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java
+++ b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 938912437636304862L;
+    private static final long serialVersionUID = 938914387591825362L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java
index e0946a5544c5..0682fc5ee7c2 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 = 7098409430179766228L;
+    private static final long serialVersionUID = -3197932564678615488L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java
index 0782cec551f5..d1936fb703eb 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 = -6348225121228830124L;
+    private static final long serialVersionUID = 3705787821139460309L;
 }
diff --git a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java
index cff30121a61a..39df6fbee060 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 = -2030779422506155860L;
+    private static final long serialVersionUID = 766792040747177006L;
 }
diff --git a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java
index 0359a1176e0f..0630991ea04e 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 = 6743256539658177984L;
+    private static final long serialVersionUID = 6033234497221529812L;
 }
diff --git a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java
index 692fc4e1d124..fa0f45780c47 100644
--- a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8758482898883652877L;
+    private static final long serialVersionUID = 1598167926602570573L;
 }
diff --git a/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java
index 087d1c03733b..0cf56ee5c8e6 100644
--- a/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java
+++ b/slice2java/cpp/test/Glacier2/sessionHelper/Test/CallbackException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 752027891190953290L;
+    private static final long serialVersionUID = -8860525750355494198L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java
index fe50cf1ac6cf..24a55cdf8f98 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 = 6417215237871086853L;
+    private static final long serialVersionUID = -5607127551477172683L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/DictClass.java b/slice2java/cpp/test/Ice/custom/Test/DictClass.java
index 388d7043e2b1..9220ea25e589 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 = 6545918526426555622L;
+    private static final long serialVersionUID = 6545927015326228182L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/custom/Test/Fixed.java b/slice2java/cpp/test/Ice/custom/Test/Fixed.java
index 3520053f1fff..d87c631b5ec0 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 = -5072330184219644703L;
+    private static final long serialVersionUID = -5072321894520204847L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/Variable.java b/slice2java/cpp/test/Ice/custom/Test/Variable.java
index 6a73f7ca0239..278e9b4625f0 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 = -4374443460314476459L;
+    private static final long serialVersionUID = -8351746118867456667L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java
index 1e5b72adb7e5..9fb1c7278da8 100644
--- a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java
+++ b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1345707435359357477L;
+    private static final long serialVersionUID = 1345714577169966902L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java
index 00993fdb7d99..bfea371a6476 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 = -6616020946342353102L;
+    private static final long serialVersionUID = -6616027240968949599L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java
index eef6b76c565d..91178b79fc77 100644
--- a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java
+++ b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4583034906146782438L;
+    private static final long serialVersionUID = 4583039395438864373L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java
index 1a299089ad34..4f5cce2614ba 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 = 5997329312453759217L;
+    private static final long serialVersionUID = 5997325339729890146L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java
index ac5ce597fc99..32fbf4c985a2 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 = -2959459475505768834L;
+    private static final long serialVersionUID = 3245531415250047682L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java
index 0292a1eb1566..91b319bc4c67 100644
--- a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java
@@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6383090117090866294L;
+    private static final long serialVersionUID = 8370894983087949814L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java
index 39f973f997b5..e7d6ab2a4c7b 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 = -1054736003803401621L;
+    private static final long serialVersionUID = 3652028100079641942L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java
index 8a7c1a252b9d..1a93f0a07ab1 100644
--- a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java
@@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1437324994143906340L;
+    private static final long serialVersionUID = 627457946058966241L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java
index bde30002ad27..bdb5da36e185 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 = 256987974492436373L;
+    private static final long serialVersionUID = -2246223177272273164L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java
index 39b4d1fe2ce8..090e64f6a2f5 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 = 3523415757705110759L;
+    private static final long serialVersionUID = -4296378724348644440L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java
index 1587d0a2a6e3..d72afca65c7b 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 = 2517837080951660439L;
+    private static final long serialVersionUID = -8512236468729625354L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/A.java b/slice2java/cpp/test/Ice/exceptions/Test/A.java
index f2747e7d2430..16a21fbfbc69 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/A.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/A.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823737242651183954L;
+    private static final long serialVersionUID = 7823737105687103432L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/B.java b/slice2java/cpp/test/Ice/exceptions/Test/B.java
index f10bb2b79985..c96bc910e4a1 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/B.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/B.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861418655860831726L;
+    private static final long serialVersionUID = -3861418957980875000L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/C.java b/slice2java/cpp/test/Ice/exceptions/Test/C.java
index e0388995bf40..67a58963570a 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/C.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/C.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080690933853969234L;
+    private static final long serialVersionUID = 1080690796889888712L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/D.java b/slice2java/cpp/test/Ice/exceptions/Test/D.java
index bfcaa1c1c648..4090b777ee7c 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/D.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/D.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780373612241246482L;
+    private static final long serialVersionUID = 4780373310121203208L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/E.java b/slice2java/cpp/test/Ice/exceptions/Test/E.java
index 4d74d0bf74c7..813c7991285b 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/E.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/E.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1876975969259500497L;
+    private static final long serialVersionUID = -1876976397981116033L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/F.java b/slice2java/cpp/test/Ice/exceptions/Test/F.java
index 4bbfa8195411..f67392229dca 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/F.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/F.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 733472885396411884L;
+    private static final long serialVersionUID = 733472867219084092L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java
index 49fac488b964..068d8fdb213a 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641411032685494842L;
+    private static final long serialVersionUID = -4641410810495739556L;
 }
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java
index 4acbde65b2b5..9db470db2665 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 = 954225036740718051L;
+    private static final long serialVersionUID = 954232177075066587L;
 
     /** @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 0fbd99793ae3..13a814a8a1ac 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 = 1339629266907262841L;
+    private static final long serialVersionUID = 1339641214166179265L;
 
     /** @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 0e6a132085d7..61534fa840e1 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 = -2729310854232774789L;
+    private static final long serialVersionUID = -2729304356968970685L;
 
     /** @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 7528b9a23530..077e03963c0b 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 = -3435402592407973763L;
+    private static final long serialVersionUID = -3435401555461259579L;
 
     /** @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 2b34307ccfee..9fec9261f370 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 = -836177268571143900L;
+    private static final long serialVersionUID = -836183931446304292L;
 
     /** @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 04e5e78face3..f6c40ce2ecfe 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 = 1132523519417426073L;
+    private static final long serialVersionUID = 1132530016823832545L;
 
     /** @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 8b22c11d88ec..18435d9f9938 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 = -6335554241876578661L;
+    private static final long serialVersionUID = -6335553194465284509L;
 
     /** @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 731d347f7615..d876a6ea27ab 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 = -4007408843516350307L;
+    private static final long serialVersionUID = -4007413256422146075L;
 
     /** @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 cff66ba7c5a4..804b1ca22205 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 = 991424319848529637L;
+    private static final long serialVersionUID = 991425999865788253L;
 
     /** @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 05d576ba47cd..d2eba394da0d 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 = -2880338680221544903L;
+    private static final long serialVersionUID = -2880326897966932735L;
 
     /** @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 6f270602fb23..dad6c32ff129 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 = -8808272016755005893L;
+    private static final long serialVersionUID = -8808265684495506045L;
 
     /** @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 f9a5d6be9881..598c400b7c7b 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 = -771857338979336131L;
+    private static final long serialVersionUID = -771856467036926203L;
 
     /** @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 ab4c88c5c596..3b7e18c18dee 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 = 6566358617732048934L;
+    private static final long serialVersionUID = 6566346504861776222L;
 
     /** @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 a02c15c44ad8..095fbdc54461 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 = 6983800434242182489L;
+    private static final long serialVersionUID = 6983807096956488737L;
 
     /** @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 837afd1f372c..26f0bde7701b 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 = -1175218421415514021L;
+    private static final long serialVersionUID = -1175217208696320093L;
 
     /** @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 fa9b04bfc7cd..427efba92c53 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 = -3279717141708570531L;
+    private static final long serialVersionUID = -3279721389306466523L;
 
     /** @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 92fd276b3828..335ee9a4d77e 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 = -4359176053367536409L;
+    private static final long serialVersionUID = -4359179823345390113L;
 
     /** @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 c7fe98d31019..67f7fb66b635 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 = 5904686054458650873L;
+    private static final long serialVersionUID = 5904698001717567297L;
 
     /** @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 97ddb3cb3e13..b2012d1d9ec2 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 = 1835745933318613243L;
+    private static final long serialVersionUID = 1835752430582417347L;
 
     /** @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 f38763df2448..9f1ea728588c 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 = -2252403245638290947L;
+    private static final long serialVersionUID = -2252402208691576763L;
 
     /** @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 3d5cf905388b..23716d98b6e2 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 = -1203535339614351832L;
+    private static final long serialVersionUID = -1203531774072396592L;
 
     /** @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 fad46e4cdd15..533aaf32b0ac 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 = -7537768512169859047L;
+    private static final long serialVersionUID = -7537762014763452575L;
 
     /** @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 7da468cefac9..0ff90c9b4eb8 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 = 3440897800245687835L;
+    private static final long serialVersionUID = 3440898847656981987L;
 
     /** @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 a5e73d17f1e1..8d593b73798b 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 = 9151100639387621405L;
+    private static final long serialVersionUID = 9151096226481825637L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/library/Test/UserError.java b/slice2java/cpp/test/Ice/library/Test/UserError.java
index 15228004455a..cc4e0e366d34 100644
--- a/slice2java/cpp/test/Ice/library/Test/UserError.java
+++ b/slice2java/cpp/test/Ice/library/Test/UserError.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126953839664297808L;
+    private static final long serialVersionUID = -1126958035567932448L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/A.java b/slice2java/cpp/test/Ice/objects/Test/A.java
index 896ed6e8116e..879e59da051d 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 = -1163406711035542025L;
+    private static final long serialVersionUID = 8620651279263217780L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/A1.java b/slice2java/cpp/test/Ice/objects/Test/A1.java
index 27ecef7be0c5..c25ffdcc08e0 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 = -5926745826040143216L;
+    private static final long serialVersionUID = -5926745216457348038L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/B.java b/slice2java/cpp/test/Ice/objects/Test/B.java
index 8c39ac659be7..a006d200f13c 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 = -8890919033783206176L;
+    private static final long serialVersionUID = -8890916430077243281L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/B1.java b/slice2java/cpp/test/Ice/objects/Test/B1.java
index 4f54bc76fc9f..026c3884fb72 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 = -1565439826075643196L;
+    private static final long serialVersionUID = -2323420154475423612L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Base.java b/slice2java/cpp/test/Ice/objects/Test/Base.java
index d4b6dcfb6dd7..b993bf86665f 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 = 7998668080994284768L;
+    private static final long serialVersionUID = -2517124999430875282L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java
index 99d235b374f4..e3d43fb311a8 100644
--- a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java
+++ b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3897763883977032898L;
+    private static final long serialVersionUID = 3897765810857156456L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/C.java b/slice2java/cpp/test/Ice/objects/Test/C.java
index cdce8b40ca2e..62a529f4207b 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 = -8198554653464915801L;
+    private static final long serialVersionUID = 7885115780315001532L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/COneMember.java b/slice2java/cpp/test/Ice/objects/Test/COneMember.java
index 4583a2fdb9ba..cfc42b0a7a5d 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 = 3050977559249969197L;
+    private static final long serialVersionUID = 3050969660633680132L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java
index 7139fb17b5db..050467f1def0 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 = 9019644012799133083L;
+    private static final long serialVersionUID = -7815275988917417829L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/D.java b/slice2java/cpp/test/Ice/objects/Test/D.java
index 7bf19580ccc4..e68c2e9d33db 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 = 5919578845459567475L;
+    private static final long serialVersionUID = -3065922514514079777L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/D1.java b/slice2java/cpp/test/Ice/objects/Test/D1.java
index 9203adb68f57..929287bc3e56 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 = -2281056365642298749L;
+    private static final long serialVersionUID = -5710044623916030909L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Derived.java b/slice2java/cpp/test/Ice/objects/Test/Derived.java
index 1b19fd12d571..134792d020b3 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 = -1587923730101959755L;
+    private static final long serialVersionUID = -1587932351934828922L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/E.java b/slice2java/cpp/test/Ice/objects/Test/E.java
index 4595d30b3b62..7eb57d29885f 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 = -4845000287033528011L;
+    private static final long serialVersionUID = 1561286253549785373L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/EBase.java b/slice2java/cpp/test/Ice/objects/Test/EBase.java
index 8e7e1d62de99..740e0237d185 100644
--- a/slice2java/cpp/test/Ice/objects/Test/EBase.java
+++ b/slice2java/cpp/test/Ice/objects/Test/EBase.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6426542494501404274L;
+    private static final long serialVersionUID = -241188353120052146L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/EDerived.java b/slice2java/cpp/test/Ice/objects/Test/EDerived.java
index 8256be245828..a4dcb15cfd66 100644
--- a/slice2java/cpp/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/cpp/test/Ice/objects/Test/EDerived.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 42339552764758546L;
+    private static final long serialVersionUID = -3978817403858033966L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java
index 7f1fc8f90a62..17e8385e14b5 100644
--- a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225292702741488542L;
+    private static final long serialVersionUID = -6225291416285639413L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java
index 104c393a6d48..2da4e9f8ad1a 100644
--- a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5169418289627565292L;
+    private static final long serialVersionUID = 6381591081290616724L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/F.java b/slice2java/cpp/test/Ice/objects/Test/F.java
index 348e1eecca33..23018eeb0028 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 = 5982162509777004625L;
+    private static final long serialVersionUID = -4874678648101082159L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/F1.java b/slice2java/cpp/test/Ice/objects/Test/F1.java
index 7b2558d27a7f..e236ed0c95ac 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 = 6192374232659892773L;
+    private static final long serialVersionUID = 6192369477474970373L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/F3.java b/slice2java/cpp/test/Ice/objects/Test/F3.java
index c6830154f016..64ed186c841d 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 = 1027295170206973527L;
+    private static final long serialVersionUID = 7331643084925678852L;
 
     /** @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 623c00586fd4..6843d4e0cf49 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 = -1425260818778380534L;
+    private static final long serialVersionUID = -1425258886801654267L;
 
     /** @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 88cd4995e0af..a25ce8530b80 100644
--- a/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337229663275224535L;
+    private static final long serialVersionUID = -2337224487232898173L;
 }
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 8b292dd5a7d0..49bb96a9b2da 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 = -1298678722254074112L;
+    private static final long serialVersionUID = -1298677446192382975L;
 
     /** @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 bf16d980eb2f..ed3fab97f7eb 100644
--- a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842237966318868941L;
+    private static final long serialVersionUID = 1842232072200802983L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/K.java b/slice2java/cpp/test/Ice/objects/Test/K.java
index a011dc49063a..74d5f919db16 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 = 4645162128220254601L;
+    private static final long serialVersionUID = 4645161007221291541L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/L.java b/slice2java/cpp/test/Ice/objects/Test/L.java
index 13456b4fc84a..a7c29e023e47 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 = 6629738661765910747L;
+    private static final long serialVersionUID = 6629737380781196209L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/M.java b/slice2java/cpp/test/Ice/objects/Test/M.java
index 62ce7338bc63..b92509a2ea5a 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 = -8088097466687305980L;
+    private static final long serialVersionUID = -8088091205815183595L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Recursive.java b/slice2java/cpp/test/Ice/objects/Test/Recursive.java
index 448c9b05fc43..38046bef32e6 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 = 3617877211133087187L;
+    private static final long serialVersionUID = 3617877092325420092L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/S.java b/slice2java/cpp/test/Ice/objects/Test/S.java
index 33df6bf5de4e..9b6987ada400 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 = 481771478253923048L;
+    private static final long serialVersionUID = 481768466550471554L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java
index a815e960c861..c33a1edf78a7 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 = 6227753119839039604L;
+    private static final long serialVersionUID = 6227760703176133277L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java
index 997e29404932..b31deab4d821 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 = 2115118095432918658L;
+    private static final long serialVersionUID = -6090354266566622206L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/StructKey.java b/slice2java/cpp/test/Ice/objects/Test/StructKey.java
index 9794aa25202b..479c146c9bec 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 = 3736498577598159353L;
+    private static final long serialVersionUID = 5636704003331851729L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java
index 0395fac102e1..84f11a0ae56b 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 = 2723850899781856864L;
+    private static final long serialVersionUID = 2723846369316322786L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java
index f78388f32d9a..0e4da0a351f9 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 = -2349936432850935489L;
+    private static final long serialVersionUID = 790845788214310905L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java
index 4fe928974907..f556041e5126 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 = -842048200135051427L;
+    private static final long serialVersionUID = 486763640330963549L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java
index b4ce02ac7809..b9c40aef0681 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 = -4196114243035388714L;
+    private static final long serialVersionUID = -6239921553466845552L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/Structure.java b/slice2java/cpp/test/Ice/operations/Test/Structure.java
index 43de30e5f2d3..2ade49e2b251 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 = 2162424277833137424L;
+    private static final long serialVersionUID = -6222746805052554216L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/A.java b/slice2java/cpp/test/Ice/optional/Test/A.java
index b2ae2c7bc2f6..b0afde437af9 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 = -8962986171549663344L;
+    private static final long serialVersionUID = -4999543491678340848L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/B.java b/slice2java/cpp/test/Ice/optional/Test/B.java
index b86a2e926046..edb9d2713b22 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 = -7349077021997280797L;
+    private static final long serialVersionUID = -5604232073530949917L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/C.java b/slice2java/cpp/test/Ice/optional/Test/C.java
index a16de37f3d92..b4c056dcf7c6 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 = 8379996486385530237L;
+    private static final long serialVersionUID = 8853806259158705533L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java
index decd28ab1a7e..efc7d6686de4 100644
--- a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java
@@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2003361254663212080L;
+    private static final long serialVersionUID = -1490279387293725990L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/E.java b/slice2java/cpp/test/Ice/optional/Test/E.java
index 63eab3cdad7b..5bda0cb07df1 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 = -1850730880926150944L;
+    private static final long serialVersionUID = -1850740470165717142L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/F.java b/slice2java/cpp/test/Ice/optional/Test/F.java
index 5028ca3f4082..f73fa2e99141 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 = -6430490173621838061L;
+    private static final long serialVersionUID = -6430496588272031975L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java
index 5fef5450875a..8e34cbdf2d1a 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 = 1569609737479300898L;
+    private static final long serialVersionUID = 1569605642302575982L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/G.java b/slice2java/cpp/test/Ice/optional/Test/G.java
index f6b71627968a..3d7ecb9fe016 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 = -3538234006232076461L;
+    private static final long serialVersionUID = -3179781226116603821L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/G1.java b/slice2java/cpp/test/Ice/optional/Test/G1.java
index 78164c3d429d..06e19ac83d8e 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 = 7339787480779056606L;
+    private static final long serialVersionUID = 7339780180033417172L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/G2.java b/slice2java/cpp/test/Ice/optional/Test/G2.java
index df8ca6f58aa2..8459618b2785 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 = 3824559732403481342L;
+    private static final long serialVersionUID = 3824549461301323076L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java
index b0d35a818351..d7958231f1c8 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 = -2348567696383025481L;
+    private static final long serialVersionUID = 5104601866198787101L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java
index 05098845e3ee..764da0790e0b 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 = -7219607535830784180L;
+    private static final long serialVersionUID = -7219600756828369664L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java
index 672c95bdbad7..739e8ea2811f 100644
--- a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java
@@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2940733453221826284L;
+    private static final long serialVersionUID = -1392739448584738L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java
index 51a0aa5de9c4..578a7c39e2e0 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 = 6101081620464139003L;
+    private static final long serialVersionUID = -6244194884869524229L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java
index f52a363aad7e..d15eec0a3055 100644
--- a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java
@@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894241501658776855L;
+    private static final long serialVersionUID = 2894242982895186205L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java
index e98bebe6319c..31757ed8f50a 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 = 6700996185733161082L;
+    private static final long serialVersionUID = 6700983308572154676L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java
index 41c7b1c223c8..e893a4386583 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 = -1912281386805104810L;
+    private static final long serialVersionUID = -1912288005655657636L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/WD.java b/slice2java/cpp/test/Ice/optional/Test/WD.java
index 5f673aa163f8..c7549357d5d7 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 = -3295756745940369198L;
+    private static final long serialVersionUID = 7251593525841031956L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C.java b/slice2java/cpp/test/Ice/scope/Test/C.java
index ecc6464f59b7..0e8aadda4ac6 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 = -5190247342343550825L;
+    private static final long serialVersionUID = -5190249626893664742L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C1.java b/slice2java/cpp/test/Ice/scope/Test/C1.java
index 6e764ae6640c..84d6702cf81b 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 = 8893233089780187066L;
+    private static final long serialVersionUID = 8893230766344399782L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C2.java b/slice2java/cpp/test/Ice/scope/Test/C2.java
index 50705f15a98e..ebbbf806f53e 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 = 6648336376796780708L;
+    private static final long serialVersionUID = -3925678158476356532L;
 
     /** @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 a264c500c445..5f9e6fac6dbb 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 = 4615622992390426091L;
+    private static final long serialVersionUID = 4615625276980110868L;
 
     /** @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 82204e4c91fa..1890ec782262 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 = 672588680941074742L;
+    private static final long serialVersionUID = 672580902250180593L;
 
     /** @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 19774aa9a5ca..6decbef41911 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 = 8654439544921954262L;
+    private static final long serialVersionUID = 8654441868362815589L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java
index 2fe1a44cd759..0e327bdbcc94 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 = 3694621371644681626L;
+    private static final long serialVersionUID = 3694613631938953897L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S.java b/slice2java/cpp/test/Ice/scope/Test/S.java
index 9f17aedfe1a2..339c6f8585ba 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 = 2159697433299925860L;
+    private static final long serialVersionUID = 2159705173005860375L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S1.java b/slice2java/cpp/test/Ice/scope/Test/S1.java
index 527bb0c01f9b..c7e5a7fc062e 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 = 1241674690228836227L;
+    private static final long serialVersionUID = 1241671723811813791L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S2.java b/slice2java/cpp/test/Ice/scope/Test/S2.java
index 8855d6298a0a..57a4d12178aa 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 = 3145831197086475741L;
+    private static final long serialVersionUID = 853789801506348725L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java
index 67bdf6648949..396c542944c8 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477020973792749657L;
+    private static final long serialVersionUID = -477023082667973725L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 7df6e1849400..05dce5088dde 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485211641663372737L;
+    private static final long serialVersionUID = 3485209532627281605L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index ec25a5cf40d3..a10890bae772 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717375086554312112L;
+    private static final long serialVersionUID = 1717377360907633844L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index e6df9b734046..7e0cd2c4d358 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384921343664952663L;
+    private static final long serialVersionUID = -7384912376938343507L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index 90c29cb58e26..b498fb637a2e 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424368875398391854L;
+    private static final long serialVersionUID = 3424376190102378085L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index b2b31e40e897..dec3767af211 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172608083030519361L;
+    private static final long serialVersionUID = -1172593913053483916L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index b6ec018d561f..3de6975b4f44 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126115226836733370L;
+    private static final long serialVersionUID = -1126107586350631539L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index 2e3f5cc3f54c..f434dab5ccca 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097584862019300826L;
+    private static final long serialVersionUID = -2097577547296340883L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java
index 332fe833c760..1fbcfc4f0c0e 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 = 111747903754492242L;
+    private static final long serialVersionUID = 7581152336031670226L;
 
     /** @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 76f8d3c35ade..b6b56e90ad3c 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java
@@ -78,5 +78,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5703997254477637474L;
+    private static final long serialVersionUID = -155490776687204066L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 8acc9196aa97..e876b08cdae4 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 = -6396993272743463526L;
+    private static final long serialVersionUID = -6396993669346786768L;
 
     /** @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 9314b3da15de..a8f31e5e61d3 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 = -9066879981126273632L;
+    private static final long serialVersionUID = -9066881361823048460L;
 
     /** @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 cb8c77044044..fffa4a24a7a7 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 = 843025898160026097L;
+    private static final long serialVersionUID = 1121369665524278129L;
 
     /** @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 e6cde3132be0..b8eb49135951 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 = -3926284509043696817L;
+    private static final long serialVersionUID = -3714635763098427172L;
 
     /** @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 5e6779d1348c..e76bfbf241c4 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 = 2088266916775492477L;
+    private static final long serialVersionUID = 4664066712117583753L;
 
     /** @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 09d2dd149eab..b3cd0b78186c 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 = 2539472740628735731L;
+    private static final long serialVersionUID = -2734697477262411725L;
 
     /** @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 69c0c8e82bbb..ca43835d1452 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2681258201271106704L;
+    private static final long serialVersionUID = -4282405630690413552L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java
index b01af36e1c61..d6b91ca01a21 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 = -7655918974144868128L;
+    private static final long serialVersionUID = -7655923203600128972L;
 
     /** @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 5257ef8f7dda..0303f7129f78 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 = -2271132885998999363L;
+    private static final long serialVersionUID = -2271128656245997207L;
 
     /** @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 bf6bdee226b7..74e88ff57740 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 = 4147520394107196395L;
+    private static final long serialVersionUID = 4147528557386371221L;
 
     /** @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 7ce3dd24fe62..f9fda8ddaff1 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 = 481704741927655368L;
+    private static final long serialVersionUID = 481709097982796828L;
 
     /** @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 607559b1ee7b..13444457ba8a 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 = -4426878299878114598L;
+    private static final long serialVersionUID = -4426878861481142160L;
 
     /** @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 78165da51383..bd4e107505bb 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 = 850536147394223759L;
+    private static final long serialVersionUID = 850535867083762715L;
 
     /** @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 d5e28ed2e95d..c897364d82b4 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 = -4328906731368456897L;
+    private static final long serialVersionUID = -4328906812836925291L;
 
     /** @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 09d6d1c945f6..b4314a29830e 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 = -5081810632999344578L;
+    private static final long serialVersionUID = -5081810386419090390L;
 
     /** @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 dd8b9366a0b9..dac652b3ecee 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 = 643078160565800295L;
+    private static final long serialVersionUID = 643079580075752755L;
 
     /** @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 aab0a2b823d2..5dba5ffecf4a 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 = -2438003645392431401L;
+    private static final long serialVersionUID = -2438007719865557501L;
 
     /** @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 3653ffee4658..99778edaf805 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 = 3691043640015732634L;
+    private static final long serialVersionUID = 8116008488295572505L;
 
     /** @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 812aa4c3f46b..50faccac5222 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 = -8813712576462977206L;
+    private static final long serialVersionUID = -8813709664315979446L;
 
     /** @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 8c5c4537f852..0c4d06a4d62d 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 = 3651524547399403921L;
+    private static final long serialVersionUID = 3651528777038932293L;
 
     /** @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 3315c80a63fd..386a2adda7d3 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 = 8804375274797132980L;
+    private static final long serialVersionUID = 8804376373908547040L;
 
     /** @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 5f397321b0c3..d53fa95422ef 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 = -4989058775624492753L;
+    private static final long serialVersionUID = -4989066938922471777L;
 
     /** @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 5984657e6dca..ebc2b1f43b11 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 = -5353757331138822462L;
+    private static final long serialVersionUID = -5353761240475337194L;
 
     /** @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 6eaaea105640..5f80281bb0dd 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 = -6522133569687243140L;
+    private static final long serialVersionUID = -6522135115501951064L;
 
     /** @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 dd0700936b59..cc980423eda6 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 = 7620286081829242815L;
+    private static final long serialVersionUID = 7620287346248835691L;
 
     /** @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 a7e5268cb617..0bdd38e8b179 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 = -7895297009445995562L;
+    private static final long serialVersionUID = 5133880745344226774L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java
index 257431d4d9d3..00db15149ee0 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 = -169744086800971444L;
+    private static final long serialVersionUID = 7351696914850673868L;
 
     /** @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 a348672631d9..0e49a4819edc 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2461304461886412420L;
+    private static final long serialVersionUID = -2848544834910136650L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java
index 48ed682abb2f..45da7cec52dc 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 = 4995620853552342953L;
+    private static final long serialVersionUID = 4995620247943609479L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java
index 415baaa3114f..225f744dce06 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 = 4319526548771356034L;
+    private static final long serialVersionUID = 820401574441010337L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/MyClass.java b/slice2java/cpp/test/Ice/stream/Test/MyClass.java
index 4928f1dd7736..491fccfee940 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 = 4442796480479106134L;
+    private static final long serialVersionUID = 8692193264044201399L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/stream/Test/MyException.java b/slice2java/cpp/test/Ice/stream/Test/MyException.java
index d554c1798278..b929eb6f7522 100644
--- a/slice2java/cpp/test/Ice/stream/Test/MyException.java
+++ b/slice2java/cpp/test/Ice/stream/Test/MyException.java
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734227429189823662L;
+    private static final long serialVersionUID = 5734228107131441758L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java
index bdb52d126a81..8150ea0f46bb 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 = -7923476349715186085L;
+    private static final long serialVersionUID = 400668495339017060L;
 
     /** @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 08af2b456780..db19ae7066ea 100644
--- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java
+++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1404700455591231553L;
+    private static final long serialVersionUID = -1404705149992029593L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java
index 9b8a2c1d95a3..20a7b5cc634d 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 = 1540453597503163134L;
+    private static final long serialVersionUID = -4577473848924405020L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java
index e5d1929ac7b3..e4c357f67f4e 100644
--- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java
+++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8562125811242936307L;
+    private static final long serialVersionUID = -8562131954822453931L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java
index 972f8cf4c38f..45f53b9c7a29 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 = -1991727555325028815L;
+    private static final long serialVersionUID = -6112208414320059574L;
 }
diff --git a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java
index a828934cb5c5..6e498fc8f713 100644
--- a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8479858586792350146L;
+    private static final long serialVersionUID = 713606606918538890L;
 }
diff --git a/slice2java/csharp/test/Glacier2/sessionHelper/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/sessionHelper/Test/CallbackException.java
index 948b7e318c46..ee031921a90a 100644
--- a/slice2java/csharp/test/Glacier2/sessionHelper/Test/CallbackException.java
+++ b/slice2java/csharp/test/Glacier2/sessionHelper/Test/CallbackException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1286696209771806929L;
+    private static final long serialVersionUID = 7270972611906215498L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java
index 16bb64546cdc..dc13114718e1 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 = 8947304446831103852L;
+    private static final long serialVersionUID = 3373360717858420396L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java
index e2ae06459c48..6c325dc58be1 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java
@@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8298438044752798056L;
+    private static final long serialVersionUID = 3993113177268365144L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 8380a70e5eed..7c51348078b7 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 = -4094447500467853419L;
+    private static final long serialVersionUID = -7833639567615100551L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index dfc8aa5abe51..e0045123de58 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 = 14645564332857033L;
+    private static final long serialVersionUID = -7248627649195282331L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java
index d81bef3daa2d..00a4ca406aee 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 = -8797855432071154192L;
+    private static final long serialVersionUID = -25786520323198928L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java
index d5035ca10a03..19054061ea2f 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 = 6777400351753603248L;
+    private static final long serialVersionUID = 5651088040040740144L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java
index 73e21dc62542..54df2b1a7e4f 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java
@@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1912902997112606343L;
+    private static final long serialVersionUID = -2967479886811504889L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index 32ad388f2d88..07019f250c62 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
@@ -83,5 +83,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 200659789641010993L;
+    private static final long serialVersionUID = 9135258705555759901L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index 26e516578c88..fb54228e791d 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
@@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3532166208397059577L;
+    private static final long serialVersionUID = 9075363480796237205L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java
index d773916f90d9..39c6213ec6c5 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java
@@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 557590495137130784L;
+    private static final long serialVersionUID = 1817572760486796640L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java
index 31a12fd19716..1bc1ba45379b 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 = 5127390648338951891L;
+    private static final long serialVersionUID = 5127393409516160639L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java
index 2ecc4ad96021..c11c9a18500a 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 = -7135053683200407254L;
+    private static final long serialVersionUID = -7135057699642376762L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java
index 4daabe310b5a..77ef2ccefb8e 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 = -2118811389018762116L;
+    private static final long serialVersionUID = 2863847291860069500L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java
index 22665904400d..6e0f888abab3 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 = -1408138406549272505L;
+    private static final long serialVersionUID = 6676780286362104839L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java
index 47d2613b2e6e..bdcdfe63f49f 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 = 8382390043024162433L;
+    private static final long serialVersionUID = -862640720904315583L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java
index 6b12d8530910..2899c84d6524 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 = -1156756909211704058L;
+    private static final long serialVersionUID = 1534868865227885510L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java
index 07db5162cd0e..b1ee605abaf3 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 = 7225172976608185364L;
+    private static final long serialVersionUID = 7248106831958063380L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java
index f5097458e083..be50a4b36c06 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 = -2223609198320462912L;
+    private static final long serialVersionUID = 1613594571763748224L;
 }
diff --git a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java
index d6cc720c2867..8e2bb9a5b648 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 = -5301963217870929480L;
+    private static final long serialVersionUID = -7762506890537864904L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/A.java b/slice2java/csharp/test/Ice/exceptions/Test/A.java
index 3d16207ffa11..38721710053f 100644
--- a/slice2java/csharp/test/Ice/exceptions/Test/A.java
+++ b/slice2java/csharp/test/Ice/exceptions/Test/A.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823737185909823997L;
+    private static final long serialVersionUID = 7823746746639909691L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/B.java b/slice2java/csharp/test/Ice/exceptions/Test/B.java
index c8d1191c0f10..b07d3fbc4030 100644
--- a/slice2java/csharp/test/Ice/exceptions/Test/B.java
+++ b/slice2java/csharp/test/Ice/exceptions/Test/B.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861418547446089539L;
+    private static final long serialVersionUID = -3861409151872105733L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/C.java b/slice2java/csharp/test/Ice/exceptions/Test/C.java
index 0f859820048f..498cfacd4010 100644
--- a/slice2java/csharp/test/Ice/exceptions/Test/C.java
+++ b/slice2java/csharp/test/Ice/exceptions/Test/C.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080690877112609277L;
+    private static final long serialVersionUID = 1080700437842694971L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/D.java b/slice2java/csharp/test/Ice/exceptions/Test/D.java
index e441e35fb97c..d480e2235122 100644
--- a/slice2java/csharp/test/Ice/exceptions/Test/D.java
+++ b/slice2java/csharp/test/Ice/exceptions/Test/D.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780373720655988669L;
+    private static final long serialVersionUID = 4780383116229972475L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Color.java b/slice2java/csharp/test/Ice/hash/Test/Color.java
index 44a16cb9bbd1..c8bcf6e3b106 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 = -1749675571372135690L;
+    private static final long serialVersionUID = -2180701159486077450L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java
index c0f1449dc839..c88bdd8b91dd 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 = -2820070729765471391L;
+    private static final long serialVersionUID = -2820067903988194141L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Draw.java b/slice2java/csharp/test/Ice/hash/Test/Draw.java
index e23ee48232c2..c7f8a76f3262 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 = -8650728723941678384L;
+    private static final long serialVersionUID = -320282836578595591L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java
index 7d8aef2c17c6..009e942f9023 100644
--- a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java
+++ b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java
@@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1224578070453559308L;
+    private static final long serialVersionUID = -1224575079394181598L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java
index c45283c3d565..71ffab1f5772 100644
--- a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java
+++ b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java
@@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8727126756248414010L;
+    private static final long serialVersionUID = -8727118601903445872L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/OtherException.java b/slice2java/csharp/test/Ice/hash/Test/OtherException.java
index 579c89119523..6ec255fbc44c 100644
--- a/slice2java/csharp/test/Ice/hash/Test/OtherException.java
+++ b/slice2java/csharp/test/Ice/hash/Test/OtherException.java
@@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 481833045530944120L;
+    private static final long serialVersionUID = -6165793808323323148L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Pen.java b/slice2java/csharp/test/Ice/hash/Test/Pen.java
index b113589f194e..2dcde92b25a4 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 = -5073873270041547629L;
+    private static final long serialVersionUID = -4315431036149703225L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/hash/Test/Point.java b/slice2java/csharp/test/Ice/hash/Test/Point.java
index 101cace7b85e..dbcc418b56e3 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 = 3366795662850809936L;
+    private static final long serialVersionUID = 4809594409653778320L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/PointD.java b/slice2java/csharp/test/Ice/hash/Test/PointD.java
index 75cd973e85a8..0fe8794aad65 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 = 4897869900561468023L;
+    private static final long serialVersionUID = 5926829451701152358L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/PointF.java b/slice2java/csharp/test/Ice/hash/Test/PointF.java
index 6739b92e8d11..07ee85ff1b13 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 = -5042340504947494727L;
+    private static final long serialVersionUID = 5541520041774909736L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Polyline.java b/slice2java/csharp/test/Ice/hash/Test/Polyline.java
index 6a2b7a4212f2..46780ad6b2c5 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 = -345033425209540201L;
+    private static final long serialVersionUID = -345024893819569921L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java
index bb547c9f305d..362e3760402b 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 = 2568820848017035158L;
+    private static final long serialVersionUID = 2568818195353372989L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java
index ef4e2e2ec576..6c6565487fee 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 = -6709849894911170337L;
+    private static final long serialVersionUID = -6709847242304406818L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java
index 6b065331e797..26a1294031c1 100644
--- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java
+++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 244430326085011065L;
+    private static final long serialVersionUID = 244432978742958162L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java
index a5db211aa6b0..60d57ffe0c7d 100644
--- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java
+++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1207061005661036480L;
+    private static final long serialVersionUID = -1207063658419458495L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
index 8c9ff4b1730b..50a021f47b88 100644
--- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
+++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
@@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7599603801542873870L;
+    private static final long serialVersionUID = 7599601148861353125L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java
index 13447e95a4b1..90d7b7fb1970 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 = 9211538726053849357L;
+    private static final long serialVersionUID = 9211533287609789567L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java
index 0440ea4230cf..3ad112bf0dc1 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 = 770562087089762761L;
+    private static final long serialVersionUID = 770567520224143995L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java
index 55385a629c0b..9b06f870a674 100644
--- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java
+++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4823068301132834494L;
+    private static final long serialVersionUID = -4823063067046753040L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java
index eb2735dc568a..8d86982160de 100644
--- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java
+++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2279081144765736149L;
+    private static final long serialVersionUID = 2279075628682738791L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/A.java b/slice2java/csharp/test/Ice/objects/Test/A.java
index 769ab9add7e9..c3112e205eeb 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 = 702047556263057903L;
+    private static final long serialVersionUID = 2195634269964376751L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/A1.java b/slice2java/csharp/test/Ice/objects/Test/A1.java
index e4d5b9849f7d..f205ec82fb50 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 = -5926743073833715464L;
+    private static final long serialVersionUID = -5926743893998746693L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/B.java b/slice2java/csharp/test/Ice/objects/Test/B.java
index b4ea001193e5..02f7ef79111d 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 = -8890910475286335958L;
+    private static final long serialVersionUID = -8890915107705970007L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/B1.java b/slice2java/csharp/test/Ice/objects/Test/B1.java
index 64bb95dc1775..50300055f81f 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 = 9170157846476967044L;
+    private static final long serialVersionUID = 298721488571992708L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Base.java b/slice2java/csharp/test/Ice/objects/Test/Base.java
index 2b6f5624b409..c3e846cc3f48 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 = 201915107041481952L;
+    private static final long serialVersionUID = -4236001617249548736L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/C.java b/slice2java/csharp/test/Ice/objects/Test/C.java
index 89febe1e44f9..1f67fe73ee42 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 = -1417521648069674830L;
+    private static final long serialVersionUID = 698877856413370833L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/COneMember.java b/slice2java/csharp/test/Ice/objects/Test/COneMember.java
index b55648a28e8d..a2ee87205d2d 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 = 3050969000769185750L;
+    private static final long serialVersionUID = 3050979248494055893L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java
index fee0622f82a5..f7098404f15f 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 = -8905245501797912037L;
+    private static final long serialVersionUID = -154436982996719653L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/D.java b/slice2java/csharp/test/Ice/objects/Test/D.java
index 1e048a27168b..a3ccfb45e1af 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 = -7442396349356273311L;
+    private static final long serialVersionUID = 8706067801964996482L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/D1.java b/slice2java/csharp/test/Ice/objects/Test/D1.java
index 53e5beb24bad..8617f83c1111 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 = 8427307457894876739L;
+    private static final long serialVersionUID = 8818428742780645187L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/E.java b/slice2java/csharp/test/Ice/objects/Test/E.java
index aa2d315ea9fe..412391a9d0a9 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 = 2261752634544587949L;
+    private static final long serialVersionUID = -7510091549819816819L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/EBase.java b/slice2java/csharp/test/Ice/objects/Test/EBase.java
index 2610d55109b0..e05fcc0ec48e 100644
--- a/slice2java/csharp/test/Ice/objects/Test/EBase.java
+++ b/slice2java/csharp/test/Ice/objects/Test/EBase.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 509193151804097614L;
+    private static final long serialVersionUID = -4632623333692212914L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/EDerived.java b/slice2java/csharp/test/Ice/objects/Test/EDerived.java
index ec64ada89396..3aef7ca61511 100644
--- a/slice2java/csharp/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/csharp/test/Ice/objects/Test/EDerived.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9199954775883026990L;
+    private static final long serialVersionUID = 8583311193349162962L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java
index 6d42d2294d49..df1162ce2a30 100644
--- a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225284144105250087L;
+    private static final long serialVersionUID = -6225290093824719398L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java
index 7eea6cab4846..d82961754d96 100644
--- a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3599042036604649708L;
+    private static final long serialVersionUID = -4424109328996400940L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/F.java b/slice2java/csharp/test/Ice/objects/Test/F.java
index 5667f01eb41e..3d95358d1365 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 = 3460955989008790609L;
+    private static final long serialVersionUID = 7776301757007383313L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/F1.java b/slice2java/csharp/test/Ice/objects/Test/F1.java
index e2913673410a..7b722f3322c3 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 = 6192380932797330997L;
+    private static final long serialVersionUID = 6192372567866721041L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/F3.java b/slice2java/csharp/test/Ice/objects/Test/F3.java
index 0f4f46135fd9..f83278b41f2d 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 = 647158010207637406L;
+    private static final long serialVersionUID = 8739569051447722782L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/IBase.java b/slice2java/csharp/test/Ice/objects/Test/IBase.java
index b939d71cb620..5249c472afe1 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 = 4060266777345258942L;
+    private static final long serialVersionUID = 4060271737790857213L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/IDerived.java b/slice2java/csharp/test/Ice/objects/Test/IDerived.java
index 5d82cf235a73..7c6cefc8c388 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 = 7299531700462210470L;
+    private static final long serialVersionUID = 7299537983371008997L;
 
     /** @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 65a80caf8586..762055130c9c 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 = -1425258066574582848L;
+    private static final long serialVersionUID = -1425257564274117949L;
 
     /** @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 3b3c060ce345..d13031d1848e 100644
--- a/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337226309402132799L;
+    private static final long serialVersionUID = -2337225809682295422L;
 }
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 3d71b7996a08..5abcdde69e79 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 = -1298687531434794388L;
+    private static final long serialVersionUID = -1298676123820023185L;
 
     /** @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 f3b4b84c4299..8e71cabd41a8 100644
--- a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842230089719198821L;
+    private static final long serialVersionUID = 1842241660063603750L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/K.java b/slice2java/csharp/test/Ice/objects/Test/K.java
index 123cd6d40dc1..929c3f319652 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 = 4645159024821917636L;
+    private static final long serialVersionUID = 4645159684762258823L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/L.java b/slice2java/csharp/test/Ice/objects/Test/L.java
index 72f25af3ce9a..3b0f3659ddea 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 = 6629747470951366131L;
+    private static final long serialVersionUID = 6629736058331794736L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/M.java b/slice2java/csharp/test/Ice/objects/Test/M.java
index cc6a0be0dcdc..325c29729c20 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 = -8088105593892569414L;
+    private static final long serialVersionUID = -8088100793667202567L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Recursive.java b/slice2java/csharp/test/Ice/objects/Test/Recursive.java
index b30ef8378bc4..0b8796093032 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 = 3617886020237809567L;
+    private static final long serialVersionUID = 3617875769851872220L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/S.java b/slice2java/csharp/test/Ice/objects/Test/S.java
index 4e6c4bcce7f0..38847f9d967b 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 = 481774581586835008L;
+    private static final long serialVersionUID = 481769789027468419L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/S1.java b/slice2java/csharp/test/Ice/objects/Test/S1.java
index 56cbd4c00f08..3a493a4af374 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 = 7211342895699087631L;
+    private static final long serialVersionUID = 7211337935253559052L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/SC1.java b/slice2java/csharp/test/Ice/objects/Test/SC1.java
index 90d640eb51ae..65019bfe06d0 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 = 186210727943538538L;
+    private static final long serialVersionUID = 186200480062333609L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java
index 71d0ea41c4ba..d1e33fa55f3b 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 = 6227744992709778383L;
+    private static final long serialVersionUID = 6227751115320078924L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java
index 13ffa79097a0..91897e625487 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 = -7218105420405639550L;
+    private static final long serialVersionUID = 1419992588253717826L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/StructKey.java b/slice2java/csharp/test/Ice/objects/Test/StructKey.java
index bbcd31092af0..42113822fc25 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 = -1737573765533127455L;
+    private static final long serialVersionUID = 5642205829359254721L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java
index fc0b05185fd2..66bfb4b225c4 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 = 2723843703727584755L;
+    private static final long serialVersionUID = 2723846733495788409L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java
index a4ff747b98af..63c87c093bc6 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 = 7882502432790472590L;
+    private static final long serialVersionUID = 731284590066625266L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java
index 28283c276d16..17a88111c019 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 = 6725565974603487837L;
+    private static final long serialVersionUID = 6503578616453080093L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java
index 946f316a0db0..beebfc71b2b1 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 = -1559236588818641625L;
+    private static final long serialVersionUID = -7510606356663941349L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/Structure.java b/slice2java/csharp/test/Ice/operations/Test/Structure.java
index 98af638d8427..bc5d75992c9c 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 = 2361555289195506275L;
+    private static final long serialVersionUID = -7932523270838176001L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/A.java b/slice2java/csharp/test/Ice/optional/Test/A.java
index 2517cb84eba5..c2e8015b30a7 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 = 8018375695073497360L;
+    private static final long serialVersionUID = 6201509044367517584L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/B.java b/slice2java/csharp/test/Ice/optional/Test/B.java
index 0dde29c96245..280c606c0ed0 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 = 6582819592754447075L;
+    private static final long serialVersionUID = -2972697518582376861L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/C.java b/slice2java/csharp/test/Ice/optional/Test/C.java
index 78f477a09501..db84ce569a62 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 = -6071360802347475075L;
+    private static final long serialVersionUID = -8271806750616557187L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java
index 7903abafe16b..2a537e5921ad 100644
--- a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java
@@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 620423073908325828L;
+    private static final long serialVersionUID = 7872453171848283610L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/E.java b/slice2java/csharp/test/Ice/optional/Test/E.java
index 13a00ebf4351..6244d3393803 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 = -1850731223308010125L;
+    private static final long serialVersionUID = -1850739409787598635L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/F.java b/slice2java/csharp/test/Ice/optional/Test/F.java
index ed3053c33324..c4ff192d6765 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 = -6430490151538118272L;
+    private static final long serialVersionUID = -6430492880389275098L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java
index 2313c8ef683f..30e2b4341868 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 = 1569609434063404901L;
+    private static final long serialVersionUID = 1569601252520062737L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/G.java b/slice2java/csharp/test/Ice/optional/Test/G.java
index f074f050a770..fca5a3b6f2b4 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 = -482751915623813037L;
+    private static final long serialVersionUID = -2502183526348344685L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/G1.java b/slice2java/csharp/test/Ice/optional/Test/G1.java
index bcf5f0b6bcd5..41cb0f6f9b01 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 = 7339787298550767818L;
+    private static final long serialVersionUID = 7339784569809213908L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/G2.java b/slice2java/csharp/test/Ice/optional/Test/G2.java
index 24aebdeac6c7..d816744d4d9e 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 = 3824559390033974553L;
+    private static final long serialVersionUID = 3824551203548615813L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java
index 374db9095c23..c312549775c5 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 = 4002353479874823003L;
+    private static final long serialVersionUID = 798080196838928721L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java
index 42e7653c258b..de34a397b41f 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 = -7219607193521316341L;
+    private static final long serialVersionUID = -7219599014554951105L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java
index 1d49703e6844..71935da8d99c 100644
--- a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java
@@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5643301429258344640L;
+    private static final long serialVersionUID = -1260678650482865924L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java
index 6aa11639d1b4..0a1c7c9136f7 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 = -2815294590241416517L;
+    private static final long serialVersionUID = -9085484142658406725L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java
index 8dd3206b484f..481931d6e0a7 100644
--- a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java
@@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894241319428118403L;
+    private static final long serialVersionUID = 2894238593115904669L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java
index 1374fa92fe1a..8a8994a08827 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 = 6700995882296808466L;
+    private static final long serialVersionUID = 6700987698345294764L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java
index fc7ba5c41749..e8335dddf5d6 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 = -1912281569033393598L;
+    private static final long serialVersionUID = -1912284297774373540L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/WD.java b/slice2java/csharp/test/Ice/optional/Test/WD.java
index 8983cc2a8eaa..43f8e58685d4 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 = 3627520652625905377L;
+    private static final long serialVersionUID = 2704887882880816139L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C.java b/slice2java/csharp/test/Ice/scope/Test/C.java
index 2b0275be8b31..d10cce211749 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 = -5190252239606925605L;
+    private static final long serialVersionUID = -5190247266074143825L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C1.java b/slice2java/csharp/test/Ice/scope/Test/C1.java
index c2bc3b110c1c..8a5f641c1585 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 = 8893237661413674486L;
+    private static final long serialVersionUID = 8893233173643165954L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C2.java b/slice2java/csharp/test/Ice/scope/Test/C2.java
index c6f6d62481a8..ce29f0fc8394 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 = 8325338000479652130L;
+    private static final long serialVersionUID = 6074899939193060950L;
 
     /** @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 0fdd8eb4101f..a5f4e47d8da2 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 = 4615625159537189512L;
+    private static final long serialVersionUID = 4615622913401309692L;
 
     /** @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 9e7994d413e2..8ae74f3cfc25 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 = 672596303087012783L;
+    private static final long serialVersionUID = 672588922397337371L;
 
     /** @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 a85fc3827ffa..358840083998 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 = 8654434807833790950L;
+    private static final long serialVersionUID = 8654439461064010194L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java
index b4fa60e1b8d1..61dcae66f87b 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 = 3694622089689340970L;
+    private static final long serialVersionUID = 3694621608061872798L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S.java b/slice2java/csharp/test/Ice/scope/Test/S.java
index 6700d1042349..e9137289be61 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 = 2159704895418262932L;
+    private static final long serialVersionUID = 2159697194304540256L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S1.java b/slice2java/csharp/test/Ice/scope/Test/S1.java
index 9e891f7f0d22..2d2ffa0cd0b9 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 = 1241675413614008911L;
+    private static final long serialVersionUID = 1241674771531302971L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S2.java b/slice2java/csharp/test/Ice/scope/Test/S2.java
index 54704a01c7ad..bb5cdf593d8b 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 = -3602152287724669605L;
+    private static final long serialVersionUID = -1532599377628335057L;
 }
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java
index 5e613353273a..9996cc06de6b 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 = 2039944536260300126L;
+    private static final long serialVersionUID = 2039941824182148114L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java
index 24439a2ab408..1dd5d8e4113c 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 = -3369453279639456634L;
+    private static final long serialVersionUID = -3369461798143623990L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/S.java b/slice2java/csharp/test/Ice/seqMapping/Test/S.java
index 839b9329fdc0..13b3e634c67d 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 = -691304057525433047L;
+    private static final long serialVersionUID = -691295208405744155L;
 }
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java
index 3bd89f5f9b10..a20d1bd76afd 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 = 9219740195892987917L;
+    private static final long serialVersionUID = 9219737814406660801L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java
index 24db6724f73f..dfb2e1d5e863 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477023639214703887L;
+    private static final long serialVersionUID = -477023897676626588L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 2aac233c3b7d..b12db275f0f6 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485214426075389079L;
+    private static final long serialVersionUID = 3485214482911771266L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 0a17b2700cfb..33145aab59df 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717377917454364262L;
+    private static final long serialVersionUID = 1717378175916286963L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 7e94d9c52989..24222a56a70d 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384918393811637889L;
+    private static final long serialVersionUID = -7384918331970529558L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index 9bce54a5a64e..db42f3a26e5e 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424382536392506008L;
+    private static final long serialVersionUID = 3424382513300008425L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 31e1545c0a46..4d3babd48791 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172594303065021623L;
+    private static final long serialVersionUID = -1172594445128904840L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 6b492a464e8b..ceb3585c2693 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126112476012227792L;
+    private static final long serialVersionUID = -1126112499256244607L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index e384a1bc72a6..55774429bba8 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097571201025186672L;
+    private static final long serialVersionUID = -2097571224117684255L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java
index 1400a189c6f0..8f58b352cda1 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 = 8012229754295429202L;
+    private static final long serialVersionUID = -7069659096672823974L;
 
     /** @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 d61626a4e6be..18974a64e220 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java
@@ -78,5 +78,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9216108583168454558L;
+    private static final long serialVersionUID = -2584536691810459754L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java
index fb9ff2c35d56..a886d281e65f 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 = -6397005969390503402L;
+    private static final long serialVersionUID = -6397003921008698944L;
 
     /** @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 3d04cb8f0a8e..75447717435c 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 = -9066883324815190073L;
+    private static final long serialVersionUID = -9066889465708261936L;
 
     /** @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 7fbd4ad01d02..00c56474f74a 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 = 7103762694607137489L;
+    private static final long serialVersionUID = 5651477775312009081L;
 
     /** @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 df0f80733307..a92e20d2385f 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 = 7099909282462985831L;
+    private static final long serialVersionUID = -8199079138402907769L;
 
     /** @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 75c1560db239..39f93901c0e6 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 = 5468219239679186975L;
+    private static final long serialVersionUID = 7640670243956045062L;
 
     /** @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 2225823990ea..6fbfe630b546 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 = -6960134487864555469L;
+    private static final long serialVersionUID = -6096328982252278285L;
 
     /** @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 2000105c8e1f..14829d43f01e 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8595143996754677136L;
+    private static final long serialVersionUID = -8476719286976263843L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java
index a9bf13c5dcf1..f300002fc4a7 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 = -7655926535391232557L;
+    private static final long serialVersionUID = -7655931309961201811L;
 
     /** @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 381851be5cf0..4199dbf101fe 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 = -2271125489840061414L;
+    private static final long serialVersionUID = -2271120549781508052L;
 
     /** @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 14dba7a5b86c..5fab03f09dda 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 = 4147520454716475285L;
+    private static final long serialVersionUID = 4147532652566914362L;
 
     /** @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 b52a82a5e09f..8293bf8d79ea 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 = 481705525775250799L;
+    private static final long serialVersionUID = 481717204377510537L;
 
     /** @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 707b33ccf6d9..b1b1b2fd79a0 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 = -4426890996221558698L;
+    private static final long serialVersionUID = -4426894403000455552L;
 
     /** @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 5bf7217934a9..e14e2b93a541 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 = 850542541392365245L;
+    private static final long serialVersionUID = 850545948277772241L;
 
     /** @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 ae192de244de..dfde3d3f6248 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 = -4328900172055820905L;
+    private static final long serialVersionUID = -4328903504101248521L;
 
     /** @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 c207b65909d1..55db6aa4eefc 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 = -5081814467455274717L;
+    private static final long serialVersionUID = -5081816505389289797L;
 
     /** @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 49f35c631891..d73715fde615 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 = 643077536865255488L;
+    private static final long serialVersionUID = 643087683966123863L;
 
     /** @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 66d77ac3bdfe..c616d3f2ab25 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 = -2438005596717444176L;
+    private static final long serialVersionUID = -2438004916135487416L;
 
     /** @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 d490ff9ae763..f851ee17b27b 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 = -555664299879701989L;
+    private static final long serialVersionUID = -5152681181365130604L;
 
     /** @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 e092f324e870..c25f30ff22ba 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 = -8813712471967350578L;
+    private static final long serialVersionUID = -8813705755116033567L;
 
     /** @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 231dc413fcc6..d32f678c7c9b 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java
@@ -73,5 +73,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4410699544947780120L;
+    private static final long serialVersionUID = 4410695382684353463L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java
index a1a21446e143..b5ad36b23fb8 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 = 3651531943567463350L;
+    private static final long serialVersionUID = 3651536883507030825L;
 
     /** @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 d0565d8032d5..2438a819261a 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 = 8804374330802767891L;
+    private static final long serialVersionUID = 8804373567481709964L;
 
     /** @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 849715d290b8..c066fae451c8 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 = -4989058836252668988L;
+    private static final long serialVersionUID = -4989065558278977173L;
 
     /** @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 88787b59945b..cadf3de0586b 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 = -5353764572463705691L;
+    private static final long serialVersionUID = -5353758436612251206L;
 
     /** @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 349387033f0e..5e42a74cbd48 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 = -6522131623375873381L;
+    private static final long serialVersionUID = -6522143219321928431L;
 
     /** @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 c98f1d6b4d3f..b3cb7ee3318b 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 = 7620290758299155480L;
+    private static final long serialVersionUID = 7620284539715227666L;
 
     /** @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 39a627b53c69..fcd6fc032bad 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 = -2729479854285491754L;
+    private static final long serialVersionUID = 4187264915400099096L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java
index 1bcb43fb2fb8..1c0d8ae16bad 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 = 2516085644701983167L;
+    private static final long serialVersionUID = 492928532655254943L;
 
     /** @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 9f5086d6a977..b9e0da9286b5 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2085421666086590435L;
+    private static final long serialVersionUID = -7142238772087025213L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java
index 28923726bffb..73169e070d83 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 = -8253569529237211673L;
+    private static final long serialVersionUID = 7320807233325310383L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/MyClass.java b/slice2java/csharp/test/Ice/stream/Test/MyClass.java
index f3b40a2ed3a2..4a9ca71e489d 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 = 1658962635263524516L;
+    private static final long serialVersionUID = 2895473544668309667L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/stream/Test/MyException.java b/slice2java/csharp/test/Ice/stream/Test/MyException.java
index ba4fa98051cb..035913924d13 100644
--- a/slice2java/csharp/test/Ice/stream/Test/MyException.java
+++ b/slice2java/csharp/test/Ice/stream/Test/MyException.java
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734225705022567846L;
+    private static final long serialVersionUID = 5734227181142285771L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java
index feb7e125ad27..dcc36cfdb70a 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 = 2142787739404940188L;
+    private static final long serialVersionUID = -2089437172939595225L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/Clash/Cls.java b/slice2java/csharp/test/Slice/escape/Clash/Cls.java
index 94be0ea144f6..0b9e75d01336 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 = 3533461313963332355L;
+    private static final long serialVersionUID = 231239226847910217L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/Clash/Ex.java b/slice2java/csharp/test/Slice/escape/Clash/Ex.java
index e62b15e8d2ae..011934f46055 100644
--- a/slice2java/csharp/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/csharp/test/Slice/escape/Clash/Ex.java
@@ -77,5 +77,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 708763305722197672L;
+    private static final long serialVersionUID = -4415050031982938962L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/Clash/St.java b/slice2java/csharp/test/Slice/escape/Clash/St.java
index 99da61d23079..5e4a6643e4ad 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 = 1868719518841889670L;
+    private static final long serialVersionUID = -7993242437992140858L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java
index 5b415cb09ce4..6ec377eba560 100644
--- a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java
+++ b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java
@@ -147,5 +147,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2789769428990058087L;
+    private static final long serialVersionUID = 2158379900161828263L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/_break.java b/slice2java/csharp/test/Slice/escape/_abstract/_break.java
index 29fc077c928e..cbc1ef2e35ce 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 = 3009639886720894838L;
+    private static final long serialVersionUID = 3009638761944784008L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java
index 7056a700ec03..937e19719c78 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 = 9015921523903495140L;
+    private static final long serialVersionUID = -4804530556949571554L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java
index 0d53af79e34e..8116f22f9b5f 100644
--- a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java
+++ b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8293823496771568030L;
+    private static final long serialVersionUID = -8293835852162321764L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java
index 1b63027491d5..acba39473dbc 100644
--- a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java
+++ b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6469321246089912317L;
+    private static final long serialVersionUID = -8848519420717387773L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java
index 348d9a569cc3..fad08c346620 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 = 3199811308219282385L;
+    private static final long serialVersionUID = -997543334304393928L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/macros/Test/Default.java b/slice2java/csharp/test/Slice/macros/Test/Default.java
index 06071c9c3401..46302d8441b5 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 = 5120332695206063166L;
+    private static final long serialVersionUID = -7247157188291149282L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java
index da4e3f79c539..0ef078abac56 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 = 6192334314343818719L;
+    private static final long serialVersionUID = -2845455404017962113L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/structure/Test/C.java b/slice2java/csharp/test/Slice/structure/Test/C.java
index 6b4af3253108..7e3002590cb4 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 = -3172283335948964402L;
+    private static final long serialVersionUID = -3172275455572912932L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/structure/Test/S1.java b/slice2java/csharp/test/Slice/structure/Test/S1.java
index 2e8c75c5baed..776fff5dab3c 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 = -5542854081424670294L;
+    private static final long serialVersionUID = -5542862721361899765L;
 }
diff --git a/slice2java/csharp/test/Slice/structure/Test/S2.java b/slice2java/csharp/test/Slice/structure/Test/S2.java
index 62f693873ab7..ee81c59b2f96 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 = 2956282272032532156L;
+    private static final long serialVersionUID = -3332067481980805940L;
 }
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 af9128357c6d..c54ff7f1ca81 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
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4122855608597044705L;
+    private static final long serialVersionUID = -2926004838219283590L;
 }
diff --git a/slice2java/java/test/src/main/java/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java b/slice2java/java/test/src/main/java/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java
index a3dda8d01c95..e9248b7d1f37 100644
--- a/slice2java/java/test/src/main/java/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java
+++ b/slice2java/java/test/src/main/java/test/Glacier2/sessionHelper/test/Glacier2/sessionHelper/Test/CallbackException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6102298848952528058L;
+    private static final long serialVersionUID = -7625816791643302553L;
 }
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 05b797d9158f..0958fa0ade68 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 = 6434292959893257800L;
+    private static final long serialVersionUID = 6434300219143620358L;
 
     /** @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 be760c3e1ba5..03ed08a92448 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 = 6384638929000141420L;
+    private static final long serialVersionUID = 6384637742300468299L;
 }
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 7416490a06c5..aa2a03f61c3b 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 = -2014568658784989373L;
+    private static final long serialVersionUID = -2014564390561815816L;
 }
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 92d5d2c642fc..fb83270b6ccb 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 = -6189108562237569196L;
+    private static final long serialVersionUID = 8500897448386681556L;
 
     /** @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 4d5a28477128..20ffb26434a7 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
@@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5315609390945394528L;
+    private static final long serialVersionUID = 7273402271567533536L;
 }
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 eeb1df9eee25..b126ff3ddbf1 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 = 3814256972530508668L;
+    private static final long serialVersionUID = 457044852926919548L;
 
     /** @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 8cdeaf70c6b5..08d8886f6ba0 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 = 576117050872983482L;
+    private static final long serialVersionUID = -6589459263376731554L;
 
     /** @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 0a56901ac398..4b1d87cab807 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 = -8105368195472476819L;
+    private static final long serialVersionUID = -8108557261632073107L;
 
     /** @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 fcbb456bebe8..b472301f69a4 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
@@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5894254484314779430L;
+    private static final long serialVersionUID = 9077996407776295642L;
 }
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 9e01e0f8f47a..0b6525f3ffa2 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
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1324037806672370008L;
+    private static final long serialVersionUID = -324310204268222504L;
 }
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 a98f7ba9c6e2..6c2ff679ff56 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
@@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6918310881393482934L;
+    private static final long serialVersionUID = -6577983020850391826L;
 }
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 b6307a21fa2b..ff1869f44405 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 = 5127387499758717004L;
+    private static final long serialVersionUID = 5127391666034811816L;
 }
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 eff7b7c34933..5b4cb049fa14 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 = 4771872981665139417L;
+    private static final long serialVersionUID = -5464062138397067943L;
 }
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 5784ab794f4a..1b9484b5eb7f 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 = 3010965387044260725L;
+    private static final long serialVersionUID = -7435627412398346059L;
 }
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 564484c5d4ce..0528d7720d29 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 = 7450515071890870192L;
+    private static final long serialVersionUID = -7622517260374455980L;
 }
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 5400512af50d..a6582a6785f7 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
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823738606588412215L;
+    private static final long serialVersionUID = 7823745241999098616L;
 }
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 1f78f2f8d9ed..e523a6ca3e6c 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
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861417291923603209L;
+    private static final long serialVersionUID = -3861410491204877640L;
 }
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 ff2154dd25f9..2e2bdf9edf26 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
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080692297791197495L;
+    private static final long serialVersionUID = 1080698933201883896L;
 }
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 9bfce6fddbb3..4ea7e1d3099d 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
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780374976178474999L;
+    private static final long serialVersionUID = 4780381776897200568L;
 }
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 e20b89e6213f..4382a4353b4b 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
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823740599148168729L;
+    private static final long serialVersionUID = 7823740716598435900L;
 }
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 42b73a6d61d6..f5899af5cf64 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
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861420919680789287L;
+    private static final long serialVersionUID = -3861420802230522116L;
 }
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 52b1c2d11a32..d0c4e736b1e0 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
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080694290350954009L;
+    private static final long serialVersionUID = 1080694407801221180L;
 }
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 cdca64b303e8..8f35cc24acbe 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
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780371348421288921L;
+    private static final long serialVersionUID = 4780371465871556092L;
 }
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 e4970423464a..4264532b36ec 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 = -3826016725546785418L;
+    private static final long serialVersionUID = -9103997572175363722L;
 }
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 d43a213ddca4..6ad74afa307f 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 = -2820070753210017235L;
+    private static final long serialVersionUID = -2820063909488882917L;
 }
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 fa2f91ea0650..b1e6cc5bd2f1 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 = -8798477268751895656L;
+    private static final long serialVersionUID = 8757544425478117806L;
 }
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 f44e4f22432f..d09b1f2c6390 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 = 4185087432702799072L;
+    private static final long serialVersionUID = -1977986104945454048L;
 
     /** @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 2f9c716860c9..a56d46d12bce 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 = -6357904911371467376L;
+    private static final long serialVersionUID = 4151325771112115920L;
 }
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 434c6f98d412..66169112a4d0 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 = -8099076329440236247L;
+    private static final long serialVersionUID = 8835750198549492639L;
 }
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 0b297c6e4229..220dd474739f 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 = -8333039577516354406L;
+    private static final long serialVersionUID = -3482383838354157780L;
 }
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 53c6ee3ded7d..6d4b06bef67a 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 = -345033285779157765L;
+    private static final long serialVersionUID = -345029169803181299L;
 }
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 631ea786e007..b50028138b96 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 = -1269944120266219764L;
+    private static final long serialVersionUID = -4280005110075155900L;
 
     /** @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 76f11920157e..d04fae0192e3 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 = -5926738848164805949L;
+    private static final long serialVersionUID = -5926744016768712880L;
 
     /** @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 f3219bdec7e6..88944ad12835 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 = -8890911890800173962L;
+    private static final long serialVersionUID = -8890915225161271033L;
 
     /** @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 aaf41a4fd210..5fb357bc4b7c 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 = -4846442874289685372L;
+    private static final long serialVersionUID = -4668709664555074556L;
 
     /** @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 a9ff59b87c1b..29dccf71f9d3 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 = 4100706473821147977L;
+    private static final long serialVersionUID = -514064260497195528L;
 
     /** @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 d43f50aa094a..69b7792a4eb1 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 = -7791704833934542921L;
+    private static final long serialVersionUID = 8780650635806124220L;
 
     /** @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 fafee3880492..5490f5751920 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 = 3050965291669973275L;
+    private static final long serialVersionUID = 3050979366090796689L;
 
     /** @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 eec9a2c1aebe..49b41662069b 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 = 7345244109226447835L;
+    private static final long serialVersionUID = -6121919954960562597L;
 
     /** @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 7a3360e208ba..ced7260e473b 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 = -8135606444736258338L;
+    private static final long serialVersionUID = 286472380266107399L;
 
     /** @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 23bb46ad5802..e219446fc1c3 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 = -6236410209773618109L;
+    private static final long serialVersionUID = 7429192386790434755L;
 
     /** @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 7d8cbf36b9b6..47662d5e4738 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 = -1152691820807369570L;
+    private static final long serialVersionUID = -1731200944178657795L;
 
     /** @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 a4aa5fadaff3..ceee0f4660b3 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
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3345149129985944654L;
+    private static final long serialVersionUID = -5645970026557652018L;
 }
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 ed94fe8381ba..df6d0cce26b1 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
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5653879501608110126L;
+    private static final long serialVersionUID = -2295188026103938990L;
 }
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 ffdc5540e868..f560ec697451 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
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225280104390237804L;
+    private static final long serialVersionUID = -6225290376884503778L;
 }
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 9097255ff816..bd0dd3844e47 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
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1402787904535257772L;
+    private static final long serialVersionUID = -8446208809759159852L;
 }
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 581e3d5804b6..31fdc59f7bf5 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 = 7084436428831751697L;
+    private static final long serialVersionUID = -4747115761120009647L;
 
     /** @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 08ac38fce4ee..b52f825ff009 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 = 6192376010932965457L;
+    private static final long serialVersionUID = 6192380909545685863L;
 
     /** @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 354686cba55c..98b6696b5c02 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 = -1793524038479108978L;
+    private static final long serialVersionUID = 5402517965967582815L;
 
     /** @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 8d7fb840afea..c70f0b11e424 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 = -1425253840799656932L;
+    private static final long serialVersionUID = -1425257687047068243L;
 
     /** @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 278e545324da..1c9389d0dedf 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
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337225575843236870L;
+    private static final long serialVersionUID = -2337225847068862615L;
 }
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 15c1ed9a3fc4..2802ff92541c 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 = -1298688760741966166L;
+    private static final long serialVersionUID = -1298675760838452319L;
 
     /** @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 7dbd3caa2237..23cde5bd087a 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
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842225698742672286L;
+    private static final long serialVersionUID = 1842241777520639629L;
 }
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 1db2349b7e7d..c81d177aaed2 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 = 4645160605578851593L;
+    private static final long serialVersionUID = 4645159807296854567L;
 
     /** @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 beab2ecd956e..49082038954b 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 = 6629743245273363208L;
+    private static final long serialVersionUID = 6629735695340295323L;
 
     /** @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 2f71cca10dd5..d276ff83833a 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 = -8088101719493254663L;
+    private static final long serialVersionUID = -8088100595917889079L;
 
     /** @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 1b2495b327df..b91d9a6faeb1 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 = 3617886919104034691L;
+    private static final long serialVersionUID = 3617875572107075771L;
 
     /** @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 47d95c759d59..c921764f199b 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 = 481773000835337275L;
+    private static final long serialVersionUID = 481769831712058920L;
 }
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 d329a531ad23..5efae472039f 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 = 6227748867103517698L;
+    private static final long serialVersionUID = 6227751312998360072L;
 }
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 ae46d05613e9..7046734dbb38 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 = 7577719103299918530L;
+    private static final long serialVersionUID = -2528865924660753854L;
 }
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 9d42fa471e64..cc12900a0e23 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 = -372378037572121006L;
+    private static final long serialVersionUID = -6761575467272164943L;
 }
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 449308c4da99..25910f900d7d 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 = 2723847720187723022L;
+    private static final long serialVersionUID = 2723850482564804000L;
 }
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 7b225512e779..40949dc75193 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 = 9026275379378654508L;
+    private static final long serialVersionUID = -3000633273141199738L;
 
     /** @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 ec48d479267b..49c9d7b4010a 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 = -2073194382934439363L;
+    private static final long serialVersionUID = 3046609549612600285L;
 }
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 a0c76f34383a..430aff54e365 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 = -3054674725736620699L;
+    private static final long serialVersionUID = -7129708418854127601L;
 }
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 74e000a535a8..30665908f76e 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 = 4108499633320845390L;
+    private static final long serialVersionUID = -8896557435357389397L;
 }
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 2ad58af0cceb..3af48847253c 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 = 2723844430899518360L;
+    private static final long serialVersionUID = 2723848351802754174L;
 }
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 8de81c94d853..2782e601e0f2 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 = 8132696799515743482L;
+    private static final long serialVersionUID = 8646854421824873339L;
 
     /** @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 6d780af11f44..c153b7845a73 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 = 7617255874542726397L;
+    private static final long serialVersionUID = -7896126186096357411L;
 }
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 db694dd81221..01e889f51009 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 = 7755575535656012083L;
+    private static final long serialVersionUID = -5821042612389041198L;
 }
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 7c9097a3a6dd..6daf1236d778 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 = -8410659982929595368L;
+    private static final long serialVersionUID = -8245962625371055053L;
 }
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 1e2366db1f98..37c08982dbd2 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 = 5089891914688479632L;
+    private static final long serialVersionUID = 8077134736078235280L;
 
     /** @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 dd7b060779d8..f732e3e7e4f7 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 = -5304815769920299037L;
+    private static final long serialVersionUID = -8653208027857670685L;
 
     /** @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 7b4d301fa3e5..2b0f5f2078bf 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 = 1115785418760301821L;
+    private static final long serialVersionUID = -4147329633833513987L;
 
     /** @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 c3e682e97dfa..ee92cc3076e7 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
@@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3336172675097041544L;
+    private static final long serialVersionUID = -3604277216402285571L;
 }
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 47d260c7047c..ff49a999fb9d 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 = -1850740654819438689L;
+    private static final long serialVersionUID = -1850739253600319853L;
 
     /** @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 749a37b171f1..febf45dff33f 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 = -6430496770229175956L;
+    private static final long serialVersionUID = -6430492349676465824L;
 
     /** @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 c4df28567ca2..6569a154d323 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 = 1569605462724354474L;
+    private static final long serialVersionUID = 1569601695570001547L;
 }
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 7fe2bd5e1462..e5358d571fb7 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 = 4181704744147954771L;
+    private static final long serialVersionUID = 7535179696190595027L;
 
     /** @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 de5d2329f44e..f7c69ad8102e 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 = 7339780679853318406L;
+    private static final long serialVersionUID = 7339784292213501299L;
 }
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 dd439a6207db..24676005b30d 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 = 3824549958526399432L;
+    private static final long serialVersionUID = 3824550677862631227L;
 }
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 a615c5f632ae..8acc2b26d96c 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 = -2709699447057522212L;
+    private static final long serialVersionUID = 608702389707717402L;
 
     /** @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 bb0f30baaaa5..bea895619e95 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 = -7219600579832942524L;
+    private static final long serialVersionUID = -7219599413850470875L;
 
     /** @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 b7312ba0af7f..0beb76b21325 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
@@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3381147635832383723L;
+    private static final long serialVersionUID = -2727140206660434283L;
 }
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 403a8266a8c8..86f785247251 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 = -3544220854165887173L;
+    private static final long serialVersionUID = 203283952226367035L;
 
     /** @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 fd99982a8e1c..09a06014d7db 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
@@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894242803249201871L;
+    private static final long serialVersionUID = 2894239075063787258L;
 }
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 2231a3e741f3..dc55c8fe37cf 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 = 6700983808356194181L;
+    private static final long serialVersionUID = 6700987381855006962L;
 }
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 df3d151f0b5f..77d56206639f 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 = -1912288187730269042L;
+    private static final long serialVersionUID = -1912283893475573509L;
 }
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 5f7a8a6b299f..5e3d2141ee98 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 = 6702761319123329538L;
+    private static final long serialVersionUID = -8993145478364834634L;
 
     /** @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 3a68178581e7..dce8cd9ec798 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 = 3416569341846995216L;
+    private static final long serialVersionUID = -7001690406533869808L;
 
     /** @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 ec19a753e91f..c36230dc0ac9 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 = -5909917538544755997L;
+    private static final long serialVersionUID = -2229376994175937309L;
 
     /** @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 d1e646021a08..989985f0c4e1 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 = -8141084437487854595L;
+    private static final long serialVersionUID = 1884702063446779517L;
 
     /** @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 5a1de6ac8601..061bf891c4e7 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
@@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3884642345367901298L;
+    private static final long serialVersionUID = 6949419505175653505L;
 }
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 129ab38f37f0..8b542199f4cd 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 = -1850731246498859206L;
+    private static final long serialVersionUID = -1850742633348408141L;
 
     /** @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 777f392e570b..148d95e47e66 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 = -6430490128351299383L;
+    private static final long serialVersionUID = -6430489656823573952L;
 
     /** @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 d7e54c17ee5a..7168f6899fcf 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 = 1569609372055659952L;
+    private static final long serialVersionUID = 1569604806658645249L;
 }
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 d678ad2cd4ae..d946641706cc 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 = -5308218339530326573L;
+    private static final long serialVersionUID = -845797594991024493L;
 
     /** @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 42ca85d06db7..db274b3ac704 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 = 7339787526053904128L;
+    private static final long serialVersionUID = 7339781180941357711L;
 }
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 5b5994a84f52..e4912aa57914 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 = 3824559366844762309L;
+    private static final long serialVersionUID = 3824547979997166079L;
 }
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 522bebff72f4..224643792d73 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 = -3882036844734503090L;
+    private static final long serialVersionUID = -4666144820248365856L;
 
     /** @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 9197e66f7b21..96db775e0f05 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 = -7219607420951824546L;
+    private static final long serialVersionUID = -7219601246230505553L;
 
     /** @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 8f6df4013d82..3751c4a885f4 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
@@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7296360761657641567L;
+    private static final long serialVersionUID = -3735344210001929829L;
 }
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 73a348d182c7..712dcc134589 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 = -484050096856153029L;
+    private static final long serialVersionUID = -4628876758486316485L;
 
     /** @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 6f905bf133b0..4d9033dbc24b 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
@@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894241296393387465L;
+    private static final long serialVersionUID = 2894235204249711430L;
 }
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 55d1dfff6f12..b579c7e6a94f 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 = 6700996070854374601L;
+    private static final long serialVersionUID = 6700991252464720229L;
 }
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 281a756d4ecb..f5cd324d0fc8 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 = -1912281341530240888L;
+    private static final long serialVersionUID = -1912287686642803705L;
 }
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 5da5425f0090..0252e4e3004c 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 = -4117359110792580642L;
+    private static final long serialVersionUID = 7080319350734446656L;
 
     /** @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 c1ccc9e086c7..367974b43845 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 = 1894600734939552009L;
+    private static final long serialVersionUID = 1894608876496010400L;
 
     /** @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 0ce32c0b948f..833270f1257a 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 = 2892572165675116848L;
+    private static final long serialVersionUID = 2892574614345883512L;
 
     /** @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 d7cc13c9ed37..606605455795 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
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5787340500129306374L;
+    private static final long serialVersionUID = 5787332689340167279L;
 }
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 5eefabef170f..7be0b122d825 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
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4908744900563936618L;
+    private static final long serialVersionUID = 4908753129733527842L;
 }
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 f9735f3d4f78..d0cf71ea2cff 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
@@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4322846292082735601L;
+    private static final long serialVersionUID = 4322854107900178712L;
 }
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 5377a644ad53..55f29cd119d0 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 = 5832349605806651725L;
+    private static final long serialVersionUID = 5832352717195683577L;
 
     /** @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 2b7f1dc19a09..ecd6b1323824 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 = 2769372834800342326L;
+    private static final long serialVersionUID = 2769375664340180994L;
 
     /** @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 41d451577470..344d2db288d2 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
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5344586176193014786L;
+    private static final long serialVersionUID = 5344583434469508982L;
 }
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 f590d646ea76..46c418611793 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
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8399051299787911570L;
+    private static final long serialVersionUID = -8399048266044196390L;
 }
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 2a72472ffc70..8786402d36f6 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 = -860919010155976820L;
+    private static final long serialVersionUID = -860915976416308104L;
 
     /** @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 9de97e2827ef..24f62682d504 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 = 954149954492312406L;
+    private static final long serialVersionUID = 954152778866279202L;
 
     /** @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 e6f2bc223326..251168e50d94 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
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6934988542060710819L;
+    private static final long serialVersionUID = 6934985717536196439L;
 }
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 2043e348cb04..ef39b02d7937 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
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5414535998444697423L;
+    private static final long serialVersionUID = 5414538949382525307L;
 }
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 7a1456be2863..30cf6fbe296f 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 = -5190243914805079918L;
+    private static final long serialVersionUID = -5190247160180750096L;
 
     /** @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 19b67422eb1e..6568694e9b0f 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 = 8893234951911934223L;
+    private static final long serialVersionUID = 8893233233057540941L;
 
     /** @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 580929e00c58..5e9151440074 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 = -3356213551581066916L;
+    private static final long serialVersionUID = -1180198108912664883L;
 
     /** @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 8ffc1a257b69..5c00a6145b24 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 = 4615627912751670175L;
+    private static final long serialVersionUID = 4615622810274389324L;
 
     /** @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 df67a62812b9..287cbd641bfd 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 = 672587980812279601L;
+    private static final long serialVersionUID = 672588984358974498L;
 
     /** @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 12ae9562bc19..51b1efebed10 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 = 8654437352025230827L;
+    private static final long serialVersionUID = 8654439401652599800L;
 }
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 e58a5dea792e..c84764723fee 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 = 3694613888871574823L;
+    private static final long serialVersionUID = 3694621713953188532L;
 }
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 2eb5a3f7f144..c890781e6310 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 = 2159702353800719257L;
+    private static final long serialVersionUID = 2159697090987027978L;
 }
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 5acb7b8d00fe..3b60126bcacb 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 = 1241683578115312822L;
+    private static final long serialVersionUID = 1241674872419801844L;
 }
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 8ffd3e33db7c..6770877dfa71 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 = -2152433132374766683L;
+    private static final long serialVersionUID = -2004423363721616460L;
 }
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 c3c234c9c6ba..3f9feb54c6e4 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8352204215926103846L;
+    private static final long serialVersionUID = 6611340561123778022L;
 }
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 ad90698ee0b9..cb7d9cee42cc 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 = -2551162678310623513L;
+    private static final long serialVersionUID = -3204947926931815129L;
 
     /** @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 6777ebb6cda3..a1df10fe968d 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 = 6786713721036055825L;
+    private static final long serialVersionUID = 8527572251293202129L;
 }
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 5990731ed32a..2c2fee194769 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5713757194076821814L;
+    private static final long serialVersionUID = -4879172039955113375L;
 }
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 bc5c1c29abb0..e5e143d7161f 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 = -5894711543969835829L;
+    private static final long serialVersionUID = 8859410636424420000L;
 
     /** @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 33ed56ee4a9a..4ffa509bd7d2 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 = -6365711434750250627L;
+    private static final long serialVersionUID = 3488956962689338326L;
 }
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 6edd0faee1cd..7c0c537c663f 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
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477021571654176994L;
+    private static final long serialVersionUID = -477021354686409947L;
 }
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 9e99b336378a..5d0617d2de00 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485210873323856568L;
+    private static final long serialVersionUID = 3485211255442990915L;
 }
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 1edb3d80174d..530ec41539c8 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717375849894550601L;
+    private static final long serialVersionUID = 1717374951031696818L;
 }
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 ee24e11f10a8..7a02e5f99781 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384921941558874736L;
+    private static final long serialVersionUID = -7384920882544784341L;
 }
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 ac8c4c5402ea..cb2dc087e717 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2733710400748817195L;
+    private static final long serialVersionUID = -2733698423829909970L;
 }
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 8ad1b043eb89..f76374e26a99 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4528092693455233692L;
+    private static final long serialVersionUID = 4528103980895918375L;
 }
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 d5af3ee2c04c..28269fb933c6 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
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477016855219745793L;
+    private static final long serialVersionUID = -477020152412585004L;
 }
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 7d7f5bcf218a..f716591dfb69 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485210454895869593L;
+    private static final long serialVersionUID = 3485212783337085298L;
 }
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 d956147111cc..9a723f776f4b 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717371133459980136L;
+    private static final long serialVersionUID = 1717373583298174083L;
 }
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 b29d2cdca4a9..4ca33ceda0ff 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384916904821699983L;
+    private static final long serialVersionUID = -7384914064958886566L;
 }
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 e895ea899223..5f80b39718e3 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424376071442731388L;
+    private static final long serialVersionUID = 3424367572062743191L;
 }
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 0a2126e16c9f..bcf4361ae57f 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172593778739681043L;
+    private static final long serialVersionUID = -1172602492196018746L;
 }
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 713babf54ad2..2c19d4dc7413 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126108030787654764L;
+    private static final long serialVersionUID = -1126115687822328001L;
 }
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 0ff13f6421f3..434b16e40514 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097577665974961292L;
+    private static final long serialVersionUID = -2097585483459862881L;
 }
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 78dbf8531109..791e8cfff5f3 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
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477019810256690061L;
+    private static final long serialVersionUID = -477016695075832642L;
 }
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 fd89be19d65e..1331a9ccddf6 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485213120474436885L;
+    private static final long serialVersionUID = 3485210294750843480L;
 }
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 09e541371e99..55a72701d0b2 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717373923018252772L;
+    private static final long serialVersionUID = 1717370973316206121L;
 }
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 d7f04a468f77..057b654525ce 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384914404688456835L;
+    private static final long serialVersionUID = -7384917064971191120L;
 }
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 91a808fba69b..324bbd140b3e 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424367911792030448L;
+    private static final long serialVersionUID = 3424376231602816061L;
 }
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 5a275bb5756d..2b732b9b70c0 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172602150040267551L;
+    private static final long serialVersionUID = -1172593618587543764L;
 }
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 499959d9e71a..ca6751aaa3da 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126116024959684072L;
+    private static final long serialVersionUID = -1126107870636913323L;
 }
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 d2df43bdf56b..16e20f3e4982 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
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097585825606688520L;
+    private static final long serialVersionUID = -2097577505814876619L;
 }
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 d4270f137533..3ac20d117232 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 = 2986275009309235612L;
+    private static final long serialVersionUID = 3581195018287011228L;
 
     /** @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 b09b12c79296..c211006839db 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
@@ -78,5 +78,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7873166460313572656L;
+    private static final long serialVersionUID = -7126471730031777328L;
 }
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 2de06ab39386..8d658cab39ec 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 = -6397006066218309480L;
+    private static final long serialVersionUID = -6396997345015822789L;
 
     /** @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 7c7175b76256..e7334b3ef3e4 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 = -9066879734531124403L;
+    private static final long serialVersionUID = -9066880440731660882L;
 
     /** @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 f45f8787f98f..e282ac429df8 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 = 3690976132667912607L;
+    private static final long serialVersionUID = -3599363753843065665L;
 
     /** @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 f896940fa230..791abac44308 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 = -8224427233243507747L;
+    private static final long serialVersionUID = -972143715044474755L;
 
     /** @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 94a045e19ba8..7fa2c16b0e8a 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
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3703197680650280581L;
+    private static final long serialVersionUID = -3478579917147874395L;
 }
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 8d4285a8cb4b..b513b1107402 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 = -7655918729848835056L;
+    private static final long serialVersionUID = -7655923648967806605L;
 
     /** @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 02db8b97e683..6a7107997cca 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 = -2271133130022104701L;
+    private static final long serialVersionUID = -2271128376197651424L;
 
     /** @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 e757b82e73bd..8db352b64400 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 = 481704828280461860L;
+    private static final long serialVersionUID = 481713549487896967L;
 
     /** @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 d4f949628785..98b74cb058d0 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 = -4426891258357404200L;
+    private static final long serialVersionUID = -4426887827007718533L;
 
     /** @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 b8ea4677b977..dfb285191b66 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 = 850542638418680249L;
+    private static final long serialVersionUID = 850544667087162842L;
 
     /** @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 8029c6320080..731a75d5479d 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 = -4328899865904462543L;
+    private static final long serialVersionUID = -4328899164786639854L;
 
     /** @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 49e214113b58..17a4f66042e5 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 = -5081814525489535129L;
+    private static final long serialVersionUID = -5081818117144551164L;
 
     /** @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 c526fb024597..2c88a4c49c85 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 = 643077913964952522L;
+    private static final long serialVersionUID = 643085563400885993L;
 
     /** @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 7f1140c97c60..87d6351acacf 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 = -2438003731782747017L;
+    private static final long serialVersionUID = -2438013940836972396L;
 
     /** @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 3ae070f63d2b..6a544a61ac0f 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 = 3651524303242911470L;
+    private static final long serialVersionUID = 3651529057058371789L;
 
     /** @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 ce0e1ef32c47..e5737fbfb38a 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 = 8804375028057922379L;
+    private static final long serialVersionUID = 8804382677491627752L;
 
     /** @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 fb5035509569..0364817be2ea 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 = -5353757086954443779L;
+    private static final long serialVersionUID = -5353762006229323362L;
 
     /** @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 9c755d165b9f..16e131b1f79a 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 = -6522133653462362799L;
+    private static final long serialVersionUID = -6522139649817065806L;
 
     /** @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 08d4d3d8f34e..a6a6619a7a23 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 = 7620286165636693842L;
+    private static final long serialVersionUID = 7620288194601656561L;
 
     /** @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 040d854b1d54..ed1a1bcf33c9 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 = -145397876267049652L;
+    private static final long serialVersionUID = -1134334419547079860L;
 }
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 6e2015401018..865ae20ffa3f 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 = 19187880526575718L;
+    private static final long serialVersionUID = 3779581041918548454L;
 
     /** @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 e917d139d1f8..d98ab9415ee2 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
@@ -78,5 +78,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9142743903769747158L;
+    private static final long serialVersionUID = 5033670286649830314L;
 }
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 f736b75aa060..e110aff8ea11 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 = -9066883164669871607L;
+    private static final long serialVersionUID = -9066889783372263930L;
 
     /** @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 b5b805cd404b..dcb78441729e 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 = 6852685693619319365L;
+    private static final long serialVersionUID = -1099798180731053275L;
 
     /** @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 a8a74ff9eb4f..1c7eb7842e4b 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 = 5626919886268842150L;
+    private static final long serialVersionUID = -5888805231490887994L;
 
     /** @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 2d987d95e732..a136ab850ad7 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 = 2396312541722651507L;
+    private static final long serialVersionUID = 5046963445418541427L;
 
     /** @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 829a675db97a..64a0ce651d17 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
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5816320643161499101L;
+    private static final long serialVersionUID = -537230332418401731L;
 }
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 e95b358dd22f..baa478e2b83b 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 = -7655926375341755312L;
+    private static final long serialVersionUID = -7655930987252152673L;
 
     /** @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 2e32e7d9bec7..e6ede2f22bb4 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 = -2271125649984018051L;
+    private static final long serialVersionUID = -2271120872915218574L;
 
     /** @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 2b4b426b64bd..50d56e43c748 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 = 4147525385557562360L;
+    private static final long serialVersionUID = 4147520773784523767L;
 
     /** @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 e030dd4f375e..f75ddc15bc66 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 = 481705365621308343L;
+    private static final long serialVersionUID = 481716755018248248L;
 
     /** @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 17bf5d83b5ab..ff9824344cd2 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 = 643077376714377486L;
+    private static final long serialVersionUID = 643087611527084033L;
 
     /** @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 c83ca201e5c5..0c89aea5b300 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 = -2438005756867216139L;
+    private static final long serialVersionUID = -2438004758477299334L;
 
     /** @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 e75ed65a1cf5..31ed398b15a2 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 = -4089820869461698931L;
+    private static final long serialVersionUID = 4711003512268107746L;
 
     /** @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 8c95adb5b990..ea161555053a 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 = -8813706257538388566L;
+    private static final long serialVersionUID = -8813712713506342491L;
 
     /** @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 04fedac8f10a..3116325b7d04 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
@@ -73,5 +73,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4410694528708971841L;
+    private static final long serialVersionUID = 4410699985391215374L;
 }
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 4ec713738e2f..45ae7326b7fd 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 = 3651531783416090421L;
+    private static final long serialVersionUID = 3651537242377746234L;
 
     /** @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 c6392f50f238..a0955f8bc298 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 = 8804374490954140688L;
+    private static final long serialVersionUID = 8804374177035414175L;
 
     /** @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 6afae6c2f382..aec21a64a8c0 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 = -4989069222252443819L;
+    private static final long serialVersionUID = -4989058478438113190L;
 
     /** @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 8af33cb101f8..2d9c98af3e9e 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 = -5353764732615076314L;
+    private static final long serialVersionUID = -5353758113749869911L;
 
     /** @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 17a0e39cec19..60ee1bc0bec3 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 = -6522131463215739636L;
+    private static final long serialVersionUID = -6522143020505739133L;
 
     /** @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 75f6058cfa8b..ec338cd69cdd 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 = 7620290918456917519L;
+    private static final long serialVersionUID = 7620284984066796416L;
 
     /** @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 3c9b9848cd5c..1be6f2761c2c 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 = -790522450996827499L;
+    private static final long serialVersionUID = 390661343340067989L;
 }
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 a39da654e10d..faf0d194be4d 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 = -4400775543825217349L;
+    private static final long serialVersionUID = 408413742876194331L;
 
     /** @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 45660e0e9fa2..d1c073e1a8e1 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
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2186941454115970984L;
+    private static final long serialVersionUID = 4384818073813911432L;
 }
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 50f235bdf941..b4effb322ef4 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 = 5847722486826735740L;
+    private static final long serialVersionUID = 6594593555762090789L;
 
     /** @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 ef4961740d78..09f609d10886 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
@@ -78,5 +78,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1120250916777019056L;
+    private static final long serialVersionUID = 4378652347874618089L;
 }
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 85676c4e81f5..ea9f769c1c0f 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 = -8526525947786581025L;
+    private static final long serialVersionUID = -6704940644227036698L;
 
     /** @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 4bac5be52edd..ff974329ccf4 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 = 823193553258478076L;
+    private static final long serialVersionUID = 6952802156766960901L;
 
     /** @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 886a6ed412b8..275e67842ed5 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 = 7976345070675931059L;
+    private static final long serialVersionUID = -1429472129202689421L;
 
     /** @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 4ec6cfafab30..574bb21c2685 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
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3848476214060556270L;
+    private static final long serialVersionUID = -7930480307941216606L;
 }
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 c196cf3108a1..932e20541f8b 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 = -7655919036151646678L;
+    private static final long serialVersionUID = -7655922665025277913L;
 
     /** @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 79be67d12f76..7b87619e426d 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 = -2271132989204434387L;
+    private static final long serialVersionUID = -2271129360179579232L;
 
     /** @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 e634c22da6ac..e11a2108a4ca 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 = 4147532724891077631L;
+    private static final long serialVersionUID = 4147529095865935612L;
 
     /** @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 898f656b5170..035c9aedaa9f 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 = 481704765010035632L;
+    private static final long serialVersionUID = 481708394044377523L;
 
     /** @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 317e63f088d5..3f41729c60e7 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 = 643078137581253544L;
+    private static final long serialVersionUID = 643079121679995051L;
 
     /** @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 2a3e9d973bb4..d935a2e51df6 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 = -2438003872628079728L;
+    private static final long serialVersionUID = -2438007501832469477L;
 
     /** @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 d176cef77a85..b13567f85eb3 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 = -7322136244718681953L;
+    private static final long serialVersionUID = -872480805844824504L;
 
     /** @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 c3fa62a4af11..23dd67cd3bee 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 = -8813705496662456372L;
+    private static final long serialVersionUID = -8813709967733620017L;
 
     /** @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 dfdf4e20626c..bafc958dca18 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
@@ -73,5 +73,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4410695289606809207L;
+    private static final long serialVersionUID = 4410691500295389517L;
 }
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 a039ee92e1dc..08cb22d3cb72 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 = 3651524444094955609L;
+    private static final long serialVersionUID = 3651528754994412462L;
 
     /** @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 bc5b682f15e9..3563fcfc0c44 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 = 8804375251710689788L;
+    private static final long serialVersionUID = 8804376917695670667L;
 
     /** @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 6c8d1b8767de..28926d8cfc97 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 = -4989065651252311815L;
+    private static final long serialVersionUID = -4989066795504356018L;
 
     /** @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 3cf71dcfbe9e..acffc83b44f6 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 = -5353757393265619702L;
+    private static final long serialVersionUID = -5353761022298451139L;
 
     /** @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 c32837d437fa..a599b8e0de21 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 = -6522133507642649327L;
+    private static final long serialVersionUID = -6522134491651151931L;
 
     /** @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 00587d3a2d15..5bb10efd3057 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 = 7620286223949594514L;
+    private static final long serialVersionUID = 7620287890021651014L;
 
     /** @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 7e80d68c3e4a..af2e738de4c6 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 = -6609108980913389304L;
+    private static final long serialVersionUID = 5321137511102891650L;
 }
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 1ee71f87fc50..e6114bdeb0a2 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 = -5116253820841613768L;
+    private static final long serialVersionUID = -4029264219545437973L;
 
     /** @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 3ade799a71af..c4fa8085aeef 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
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7915647962257201450L;
+    private static final long serialVersionUID = -9152962087142087864L;
 }
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 face24f193aa..5226d7b77132 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 = -3099926840447720646L;
+    private static final long serialVersionUID = 633883164243115650L;
 }
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 05107ea336fc..05e57a339d61 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 = -6443450711375913475L;
+    private static final long serialVersionUID = 1229166609520731587L;
 
     /** @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 c5369fea0a14..36e9659923e3 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
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734226885474441823L;
+    private static final long serialVersionUID = 5734228752866470408L;
 }
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 bea40f5e678d..bb3022d4fd9d 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 = 197442151102407752L;
+    private static final long serialVersionUID = -6858353794887766612L;
 
     /** @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 bc29cfb41424..f14fd60d0fa7 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 = -7483380986409096624L;
+    private static final long serialVersionUID = 5729604695201100112L;
 }
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 e6bd44ac5993..698e36969ac4 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 = -3616119806353685344L;
+    private static final long serialVersionUID = -4143845806877766672L;
 
     /** @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 c854290066f0..bd076d78e4df 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
@@ -77,5 +77,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9177490191478494733L;
+    private static final long serialVersionUID = -4615372057747012131L;
 }
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 25e152efb3e8..8ae781dadc60 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 = 4419526103395072439L;
+    private static final long serialVersionUID = -2070811788390068937L;
 }
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 dd6a8b4439bd..73ecdf27d275 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 = -943493091897316512L;
+    private static final long serialVersionUID = -943482878982700794L;
 }
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 29698f31d194..9155fe96daf0 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 = 195379268053473013L;
+    private static final long serialVersionUID = 7166356891084819155L;
 
     /** @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 76fe0b3a7354..6ba033181d61 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
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2944654355976785253L;
+    private static final long serialVersionUID = -2944659429028996355L;
 }
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 8ff56e447d1a..600953718160 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
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8933142316558255287L;
+    private static final long serialVersionUID = 8983341024113242935L;
 }
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 16cb6cf5e8fd..a9f1dddcb97f 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 = -8425116949432722882L;
+    private static final long serialVersionUID = 5747417078708514078L;
 
     /** @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 565d8991b0f9..344225a13fde 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 = -3592097642776458683L;
+    private static final long serialVersionUID = 6128232982156520287L;
 
     /** @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 bb13b50fa725..1b7b7f77d2ee 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 = -503416768536767265L;
+    private static final long serialVersionUID = -1329882085692492289L;
 
     /** @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 03f72c30e604..0403286fe07d 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 = -3172274913165844678L;
+    private static final long serialVersionUID = -3172273368571581556L;
 
     /** @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 cac55261f15b..a2a6725e3a5d 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 = -5542861858647609273L;
+    private static final long serialVersionUID = -5542866094521996391L;
 }
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 5a9e9524a684..9960595ed7f4 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 = 3502938066615236667L;
+    private static final long serialVersionUID = -2041367978076687146L;
 }
diff --git a/slice2java/js/test/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/Glacier2/router/Test/CallbackException.java
index 99b9a705f11a..1b86b64b6cb0 100644
--- a/slice2java/js/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/js/test/Glacier2/router/Test/CallbackException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -542324108313261814L;
+    private static final long serialVersionUID = 512246834838145469L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Base.java b/slice2java/js/test/Ice/defaultValue/Test/Base.java
index 64983db954bc..0e85a446a885 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 = 2750424220539838558L;
+    private static final long serialVersionUID = -9172518214203723755L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java
index e73541ea4894..57284f50a63c 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java
@@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8692250186391970282L;
+    private static final long serialVersionUID = -7360586333589895519L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 684d57fd4189..37b4957723df 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 = -4979161631144702520L;
+    private static final long serialVersionUID = -7097625466570790701L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index f9048b271018..eb1e6b54bc4d 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 = -8884387265387297564L;
+    private static final long serialVersionUID = -8604192672208933496L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/Ice/defaultValue/Test/Derived.java
index e1431e586a5b..422ab22f7247 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 = -2882468456667078165L;
+    private static final long serialVersionUID = -6668245581701012976L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java
index 47694c80b159..9cbb7e7acdf6 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java
@@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -21782035670340516L;
+    private static final long serialVersionUID = -3009879773109977689L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index 1efbd80fcabe..2a5b356bf9e8 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4889111937973186900L;
+    private static final long serialVersionUID = -3902921201969235145L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index 3ff270dd419b..e3f42ee7ca5f 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
@@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3745716145166693012L;
+    private static final long serialVersionUID = -9011577528103665736L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java
index 5f9c41d84e35..02a0b813e419 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 = 5127392354239255796L;
+    private static final long serialVersionUID = 5127390387481166541L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java
index f9eb22fa8f60..6cb4900f458c 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 = -8796193548896016491L;
+    private static final long serialVersionUID = -5038690546871977211L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java
index 365035bdcbc0..9ce0eff126c8 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 = -7439906844871253433L;
+    private static final long serialVersionUID = 7551045480074374743L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java
index 3137c03a03fc..ece643112d29 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 = 5159761385269668503L;
+    private static final long serialVersionUID = -8916402159802908537L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java
index 73a1b6a50ca0..fed53acb5a82 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 = 4485659896683962728L;
+    private static final long serialVersionUID = 2608070293749692846L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/A.java b/slice2java/js/test/Ice/exceptions/Test/A.java
index 66ea280c0c78..570c567ef7a3 100644
--- a/slice2java/js/test/Ice/exceptions/Test/A.java
+++ b/slice2java/js/test/Ice/exceptions/Test/A.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823746405526617896L;
+    private static final long serialVersionUID = 7823737686902325641L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/B.java b/slice2java/js/test/Ice/exceptions/Test/B.java
index 29e4d378a356..e455f57421ab 100644
--- a/slice2java/js/test/Ice/exceptions/Test/B.java
+++ b/slice2java/js/test/Ice/exceptions/Test/B.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861409327677497496L;
+    private static final long serialVersionUID = -3861412756448988727L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/C.java b/slice2java/js/test/Ice/exceptions/Test/C.java
index 460cfc480ac6..45b27def8522 100644
--- a/slice2java/js/test/Ice/exceptions/Test/C.java
+++ b/slice2java/js/test/Ice/exceptions/Test/C.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080700096729403176L;
+    private static final long serialVersionUID = 1080691378105110921L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/D.java b/slice2java/js/test/Ice/exceptions/Test/D.java
index 9eff56d58003..0239788e0f51 100644
--- a/slice2java/js/test/Ice/exceptions/Test/D.java
+++ b/slice2java/js/test/Ice/exceptions/Test/D.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780382940424580712L;
+    private static final long serialVersionUID = 4780379511653089481L;
 }
diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/Ice/inheritance/Test/MC/A.java
index ad4897f44528..4684858f97c3 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 = 954232901628706985L;
+    private static final long serialVersionUID = 954229368058565144L;
 
     /** @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 aafc53addeec..b66ba0a67304 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 = 1339629832418579507L;
+    private static final long serialVersionUID = 1339633115296881154L;
 
     /** @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 b86d2ba3a757..ad4f11870923 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 = -2729304993703072719L;
+    private static final long serialVersionUID = -2729307165985472128L;
 
     /** @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 cae36b19a532..f74a7069c868 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 = -3435402026896657097L;
+    private static final long serialVersionUID = -3435398744018355450L;
 
     /** @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 9b4dd47436ba..be7dd55b3380 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 = -836177508935840658L;
+    private static final long serialVersionUID = -836181122429803105L;
 
     /** @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 ce4914ad73c9..4111a8b6e475 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 = 1132524084928742995L;
+    private static final long serialVersionUID = 1132521912949799842L;
 
     /** @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 7c2bbded95ce..606392e9f352 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 = -6335559291668278447L;
+    private static final long serialVersionUID = -6335556008486520544L;
 
     /** @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 50c62548aab0..101e764bfd5a 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 = -4007408278005033385L;
+    private static final long serialVersionUID = -4007410449983976538L;
 
     /** @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 f3186544fe25..11d78a6feda4 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 = 991426889718133167L;
+    private static final long serialVersionUID = 991428811308692382L;
 
     /** @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 368ef5c71e7a..d0f4d8d341c5 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 = -2880332824553831181L;
+    private static final long serialVersionUID = -2880334996836230590L;
 
     /** @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 67f8e95a6ef5..2ce9118f12b5 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 = -8808271776390308879L;
+    private static final long serialVersionUID = -8808268493512007232L;
 
     /** @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 d5080c236cbd..93a469144197 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 = -771851483311622409L;
+    private static final long serialVersionUID = -771853655594021818L;
 
     /** @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 cc24c9db3afa..e01fd3462ce7 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 = 6566352762064335468L;
+    private static final long serialVersionUID = 6566354603731074077L;
 
     /** @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 a3f5be4d4f81..cad64be33450 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 = 6983795379588493843L;
+    private static final long serialVersionUID = 6983798993082456290L;
 
     /** @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 1e52f52ae81d..971cec3778f9 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 = -1175218181050817263L;
+    private static final long serialVersionUID = -1175220022717555872L;
 
     /** @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 8ea1fbc8c87e..0a8b59fbfd11 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 = -3279722196362259177L;
+    private static final long serialVersionUID = -3279718582868296730L;
 
     /** @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 6ca76085cf57..6166450902cd 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 = -4359168188479547475L;
+    private static final long serialVersionUID = -4359171722049689316L;
 
     /** @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 b079d7fe34de..80bc2e185ff9 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 = 5904686619969967539L;
+    private static final long serialVersionUID = 5904689902848269186L;
 
     /** @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 6f4e7f4e4dd3..786c15d32244 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 = 1835751793848315313L;
+    private static final long serialVersionUID = 1835749621565915904L;
 
     /** @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 184da993d193..4afc5f720564 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 = -2252402680126974281L;
+    private static final long serialVersionUID = -2252399397248672634L;
 
     /** @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 fd34efec7a35..6a8efb96c16e 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 = -1203536261874135198L;
+    private static final long serialVersionUID = -1203539875368097645L;
 
     /** @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 4d69e4293255..531187e352fc 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 = -7537767946658542125L;
+    private static final long serialVersionUID = -7537770118637485278L;
 
     /** @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 fb3c5ebfc54f..83787ffd8bc4 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 = 3440892750453988049L;
+    private static final long serialVersionUID = 3440896033635745952L;
 
     /** @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 da8fe41667c3..0603c9c44733 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 = 9151101204898938327L;
+    private static final long serialVersionUID = 9151099032919995174L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/A.java b/slice2java/js/test/Ice/objects/Test/A.java
index ab6993a39931..647e9830298f 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 = -5705090882591271219L;
+    private static final long serialVersionUID = -8967774844449475883L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/A1.java b/slice2java/js/test/Ice/objects/Test/A1.java
index d33476998c3c..f603700f8540 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 = -5926746183838305600L;
+    private static final long serialVersionUID = -5926752096188342283L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/B.java b/slice2java/js/test/Ice/objects/Test/B.java
index e5adca172d69..638d2fdf73a2 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 = -8890918510600536325L;
+    private static final long serialVersionUID = -8890917815832597560L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/B1.java b/slice2java/js/test/Ice/objects/Test/B1.java
index 72c007a1b116..0c8f6620ee71 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 = -3514853097026028156L;
+    private static final long serialVersionUID = -2985121840653463932L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Base.java b/slice2java/js/test/Ice/objects/Test/Base.java
index bd78233c25d0..42d294efbb2b 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 = -1379712966655719792L;
+    private static final long serialVersionUID = 6172774846649248783L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/C.java b/slice2java/js/test/Ice/objects/Test/C.java
index 616c9ae9ab14..4fa97557384f 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 = 1046288603815255603L;
+    private static final long serialVersionUID = 6216861613433365087L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/COneMember.java b/slice2java/js/test/Ice/objects/Test/COneMember.java
index 407af981a234..00c95a3cf12b 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 = 3050977201289680776L;
+    private static final long serialVersionUID = 3050971211612691830L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java
index b3aa9741abd1..675a3e41bfc1 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 = 3904484560417657627L;
+    private static final long serialVersionUID = -6638092034458939749L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/D.java b/slice2java/js/test/Ice/objects/Test/D.java
index b1203d101572..9bd9ef001899 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 = -5914204999398072846L;
+    private static final long serialVersionUID = -3276095919609851591L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/D1.java b/slice2java/js/test/Ice/objects/Test/D1.java
index c6677baa0aa9..67383f764502 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 = 1676207593729730499L;
+    private static final long serialVersionUID = 8040688223523760835L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/E.java b/slice2java/js/test/Ice/objects/Test/E.java
index e5ac4c7e0816..a9a3d0faea95 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 = -9221515783192568801L;
+    private static final long serialVersionUID = -6650568940401992502L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/EBase.java b/slice2java/js/test/Ice/objects/Test/EBase.java
index 1d84882dd6c4..e4c918995b22 100644
--- a/slice2java/js/test/Ice/objects/Test/EBase.java
+++ b/slice2java/js/test/Ice/objects/Test/EBase.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8864558382532586930L;
+    private static final long serialVersionUID = 9193713466837005902L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/EDerived.java b/slice2java/js/test/Ice/objects/Test/EDerived.java
index f4fe39b523a3..1c2448fde91f 100644
--- a/slice2java/js/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/js/test/Ice/objects/Test/EDerived.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6310588347076186450L;
+    private static final long serialVersionUID = 3995296738805857234L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/EOneMember.java b/slice2java/js/test/Ice/objects/Test/EOneMember.java
index 6f417136c730..ccd27e9068eb 100644
--- a/slice2java/js/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/js/test/Ice/objects/Test/EOneMember.java
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225292383673519737L;
+    private static final long serialVersionUID = -6225292840852940615L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java
index 6da4a3790f6d..143e93cb03cb 100644
--- a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -341538630588856940L;
+    private static final long serialVersionUID = -1041773010825200620L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/F.java b/slice2java/js/test/Ice/objects/Test/F.java
index f4cd0015e2d9..e6f261c3071b 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 = -7621056213297956143L;
+    private static final long serialVersionUID = -8093306078848571183L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/F1.java b/slice2java/js/test/Ice/objects/Test/F1.java
index 4bf89d4fd25c..9079444dbcf2 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 = 6192372972196138953L;
+    private static final long serialVersionUID = 6192372812036868018L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/F3.java b/slice2java/js/test/Ice/objects/Test/F3.java
index a42a572b30da..4d0afe0e9f95 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 = -5296288194825704963L;
+    private static final long serialVersionUID = -8903814196960793097L;
 
     /** @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 5d139a6fe5d7..a36250e72797 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 = -1425261137632977775L;
+    private static final long serialVersionUID = -1425265727570785950L;
 
     /** @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 cf2c8e65d9c6..2bd2beab5791 100644
--- a/slice2java/js/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/js/test/Ice/objects/Test/Inner/Ex.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337229300301855111L;
+    private static final long serialVersionUID = -2337233972975373364L;
 }
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 fcec3b907904..aec4eafdfa9e 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 = -1298679206540178845L;
+    private static final long serialVersionUID = -1298684287005390526L;
 
     /** @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 e9add9978091..d712ecf4df54 100644
--- a/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842238329282759453L;
+    private static final long serialVersionUID = 1842233662078713320L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/K.java b/slice2java/js/test/Ice/objects/Test/K.java
index 2b7ebfa0d91d..6e54798b4568 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 = 4645161969452415426L;
+    private static final long serialVersionUID = 4645167721639728738L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/L.java b/slice2java/js/test/Ice/objects/Test/L.java
index 38834764788d..1cb9f61346b9 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 = 6629739145985475339L;
+    private static final long serialVersionUID = 6629744221625020030L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/M.java b/slice2java/js/test/Ice/objects/Test/M.java
index 89b459424795..391da10557bf 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 = -8088097307916284565L;
+    private static final long serialVersionUID = -8088097920226929348L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Recursive.java b/slice2java/js/test/Ice/objects/Test/Recursive.java
index 08ddca398047..a566462ff417 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 = 3617877734252288326L;
+    private static final long serialVersionUID = 3617883806732911694L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/S.java b/slice2java/js/test/Ice/objects/Test/S.java
index 25d9094c31db..f5806c0567ed 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 = 481771841227292216L;
+    private static final long serialVersionUID = 481772701363692621L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/SOneMember.java b/slice2java/js/test/Ice/objects/Test/SOneMember.java
index 7ec13cd855e9..6d6f8afb4025 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 = 6227753317358447633L;
+    private static final long serialVersionUID = 6227754027656267439L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/Ice/objects/Test/STwoMembers.java
index 135db5d492ea..d5e9c733fedf 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 = 8345848524757844482L;
+    private static final long serialVersionUID = -6367406425738970238L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/StructKey.java b/slice2java/js/test/Ice/objects/Test/StructKey.java
index a9265b065d5d..f09fb5188855 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 = 1455269070299338707L;
+    private static final long serialVersionUID = 8203062251405160710L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java
index 7923d3726d08..144e3d1dd373 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 = 2723844430901093697L;
+    private static final long serialVersionUID = 2723851042010277026L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/MyClass1.java b/slice2java/js/test/Ice/operations/Test/MyClass1.java
index e5f28759e801..7ca07506679f 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 = -7611983243651057734L;
+    private static final long serialVersionUID = -6303086233231900616L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct.java b/slice2java/js/test/Ice/operations/Test/MyStruct.java
index 30d92af9ce54..f83d57d6ed24 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 = -7618192541309599043L;
+    private static final long serialVersionUID = -2221321173678401603L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/Ice/operations/Test/MyStruct1.java
index 5a1bc8b304ba..7e195957d1e1 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 = 6185800174945091539L;
+    private static final long serialVersionUID = 2411967564855635057L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/Structure.java b/slice2java/js/test/Ice/operations/Test/Structure.java
index 78576a226e14..cf57c90e1fc1 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 = 5477271726709027547L;
+    private static final long serialVersionUID = 1911647258539664827L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/A.java b/slice2java/js/test/Ice/optional/Test/A.java
index 24f6b5044f44..263d27170011 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 = -6456326641737199728L;
+    private static final long serialVersionUID = -7594117927245287536L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/B.java b/slice2java/js/test/Ice/optional/Test/B.java
index 11114759067b..4b83179c6819 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 = -2153375604858379421L;
+    private static final long serialVersionUID = -6738435458438583517L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/C.java b/slice2java/js/test/Ice/optional/Test/C.java
index b122b66401d9..cc8a2fe40357 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 = 3354712897992976381L;
+    private static final long serialVersionUID = 1591516460813941117L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/DerivedException.java b/slice2java/js/test/Ice/optional/Test/DerivedException.java
index 500e2082c176..40ba46c7d4ad 100644
--- a/slice2java/js/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/js/test/Ice/optional/Test/DerivedException.java
@@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2918145449412077128L;
+    private static final long serialVersionUID = 2801238480277754137L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/E.java b/slice2java/js/test/Ice/optional/Test/E.java
index 78688e533eb1..6c8912de0748 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 = -1850730528431144187L;
+    private static final long serialVersionUID = -1850730425116004460L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/F.java b/slice2java/js/test/Ice/optional/Test/F.java
index e4435a6ce9e7..175ee048ddf1 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 = -6430490531121305098L;
+    private static final long serialVersionUID = -6430490629431710233L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/Ice/optional/Test/FixedStruct.java
index 5f350a776fdb..a26e48d445e4 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 = 1569617242272544647L;
+    private static final long serialVersionUID = 1569617136378064982L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/G.java b/slice2java/js/test/Ice/optional/Test/G.java
index 1be5c04feb6c..7ce79003af6f 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 = 8716846222377218387L;
+    private static final long serialVersionUID = 1464075704346829715L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/G1.java b/slice2java/js/test/Ice/optional/Test/G1.java
index 076e40f3a5f4..e46b493228ed 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 = 7339779976145421510L;
+    private static final long serialVersionUID = 7339780082038818839L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/G2.java b/slice2java/js/test/Ice/optional/Test/G2.java
index b1f974bc3d3c..d62c854366c6 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 = 3824560084898238699L;
+    private static final long serialVersionUID = 3824560188215674042L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/Ice/optional/Test/MultiOptional.java
index 11fb0267178f..1771ef0c49a1 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 = 8238168327536481669L;
+    private static final long serialVersionUID = -2182227607507769036L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/OneOptional.java b/slice2java/js/test/Ice/optional/Test/OneOptional.java
index 44c017042192..d4164ccbc3a5 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 = -7219605331217189207L;
+    private static final long serialVersionUID = -7219605432102342792L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/OptionalException.java b/slice2java/js/test/Ice/optional/Test/OptionalException.java
index 726583f42858..bad2f2699962 100644
--- a/slice2java/js/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/js/test/Ice/optional/Test/OptionalException.java
@@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4389661040506752042L;
+    private static final long serialVersionUID = -7106256565103033253L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java
index 5c4c92e8a619..1a13cc382f51 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 = 7784720491193608315L;
+    private static final long serialVersionUID = 4282048253780193979L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/RequiredException.java b/slice2java/js/test/Ice/optional/Test/RequiredException.java
index 3140809d6598..fcc06bca755b 100644
--- a/slice2java/js/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/js/test/Ice/optional/Test/RequiredException.java
@@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894242350079188623L;
+    private static final long serialVersionUID = 2894242283081767774L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/Ice/optional/Test/SmallStruct.java
index 2f38e4e41605..38a51a349527 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 = 6700995337470445481L;
+    private static final long serialVersionUID = 6700995404466855992L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/VarStruct.java b/slice2java/js/test/Ice/optional/Test/VarStruct.java
index 649b485a4138..c116bafad10d 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 = -1912288891438165938L;
+    private static final long serialVersionUID = -1912288785544768609L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/WD.java b/slice2java/js/test/Ice/optional/Test/WD.java
index eb7198ba94f7..45b23ece5eb0 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 = -1861247471288987313L;
+    private static final long serialVersionUID = 503655984769770927L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C.java b/slice2java/js/test/Ice/scope/Test/C.java
index 7ee8742bbe52..b97a4b7e74fa 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 = -5190251357601110489L;
+    private static final long serialVersionUID = -5190250013106990411L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C1.java b/slice2java/js/test/Ice/scope/Test/C1.java
index ffa035a0beb5..8bfa1a016ede 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 = 8893231804691988571L;
+    private static final long serialVersionUID = 8893230300055692233L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C2.java b/slice2java/js/test/Ice/scope/Test/C2.java
index fe53efba7a82..82e20aee843b 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 = -958399727837890447L;
+    private static final long serialVersionUID = 8794571152727966819L;
 
     /** @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 cc3f2a6e0855..7b4eeb62c569 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 = 4615629732499477481L;
+    private static final long serialVersionUID = 4615625743119413371L;
 
     /** @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 1ce7f66e4fd6..167aec1d3c11 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 = 672584831173815564L;
+    private static final long serialVersionUID = 672580676485851422L;
 
     /** @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 c367d388e897..cbd303fc434e 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 = 8654440664556005080L;
+    private static final long serialVersionUID = 8654442003884368586L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/Inner/S.java b/slice2java/js/test/Ice/scope/Test/Inner/S.java
index 2b5f2e408ed2..c494b9f5e60f 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 = 3694611901231612820L;
+    private static final long serialVersionUID = 3694613405867876358L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S.java b/slice2java/js/test/Ice/scope/Test/S.java
index ab2c96e6691e..35577f440c1b 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 = 2159709628715081066L;
+    private static final long serialVersionUID = 2159705479152417016L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S1.java b/slice2java/js/test/Ice/scope/Test/S1.java
index 42ab7a08806d..3a129b77894c 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 = 1241676295620057314L;
+    private static final long serialVersionUID = 1241672019645436912L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S2.java b/slice2java/js/test/Ice/scope/Test/S2.java
index 20e47d95b47c..573335011a17 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 = 2321587354402320648L;
+    private static final long serialVersionUID = 2500757765916084762L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java
index c29e677f1f4c..34dd4a135b40 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477024539460238476L;
+    private static final long serialVersionUID = -477020246625062379L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 920507344916..965008bc9cc8 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485213841128159378L;
+    private static final long serialVersionUID = 3485217813669513139L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index a8f2e5f181f5..27a50c11ad57 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717378817699898851L;
+    private static final long serialVersionUID = 1717374524846462274L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 4eaf8e152b43..f0fc650d161b 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384918973754141446L;
+    private static final long serialVersionUID = -7384915001194248677L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java
index d52398d13444..5b1969039a26 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2733696842925351553L;
+    private static final long serialVersionUID = -2733711725787968034L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
index ff4c25b5480e..0bd2e616b6d8 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4528106251278051574L;
+    private static final long serialVersionUID = 4528099633791964951L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/B.java b/slice2java/js/test/Ice/slicing/objects/Test/B.java
index f39b96cae931..3c33c5cc62f4 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 = -2604693152677808366L;
+    private static final long serialVersionUID = 6681862544584579922L;
 
     /** @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 1b0ef38c79ee..295720f57c3e 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java
@@ -78,5 +78,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1982762032695673182L;
+    private static final long serialVersionUID = -4571799105233642082L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 7b7c42385fd5..98498d8e3baf 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 = -6397003773903150639L;
+    private static final long serialVersionUID = -6397004225765425227L;
 
     /** @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 38118094131e..781b350db2e2 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 = -9066882026846107785L;
+    private static final long serialVersionUID = -9066881657490585389L;
 
     /** @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 8b9d8ced3401..e9838b613f22 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 = 7969239397283741713L;
+    private static final long serialVersionUID = -6918869250187260335L;
 
     /** @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 fa1e2566e169..b870c0efc670 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 = -3946163808632700333L;
+    private static final long serialVersionUID = -779612767929749997L;
 
     /** @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 26f85ab4358f..283313776558 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6946938800558627280L;
+    private static final long serialVersionUID = -1621954229882908176L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java
index 3058b5753755..6fe8918e7424 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 = -7655916928180022922L;
+    private static final long serialVersionUID = -7655916806933823214L;
 
     /** @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 90677dae818c..b894cc49b407 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 = -2271134931571592150L;
+    private static final long serialVersionUID = -2271135053121244146L;
 
     /** @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 97128fc56895..bd03f1787611 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 = 481707120657791647L;
+    private static final long serialVersionUID = 481706668638988795L;
 
     /** @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 1e09d638da76..5abda35b310b 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 = -4426894421202807279L;
+    private static final long serialVersionUID = -4426894542752877323L;
 
     /** @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 711615a5f3de..b5b142d0b760 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 = 850545971671363010L;
+    private static final long serialVersionUID = 850545927614389222L;
 
     /** @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 eeda5487df3c..4090744eb2d7 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 = -4328903519715734604L;
+    private static final long serialVersionUID = -4328903403175129776L;
 
     /** @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 47fd53f1bb6b..5127668464d1 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 = -5081816327000414321L;
+    private static final long serialVersionUID = -5081816691355797589L;
 
     /** @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 2297aa313c2c..ba8ed1ae03b2 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 = 643076112410511152L;
+    private static final long serialVersionUID = 643076073670928340L;
 
     /** @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 b9587b37699d..2a8b0630b260 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 = -2438007065003752576L;
+    private static final long serialVersionUID = -2438007264042048860L;
 
     /** @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 5d8e11e2ee40..2ddc463fda6c 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 = 3651522501712993222L;
+    private static final long serialVersionUID = 3651522380314725282L;
 
     /** @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 b75af74b38c5..1314483926de 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 = 8804372906234111971L;
+    private static final long serialVersionUID = 8804373187940145031L;
 
     /** @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 b680e610c94a..5556de6306de 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 = -5353754965149398123L;
+    private static final long serialVersionUID = -5353755164206081231L;
 
     /** @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 1ea127db9229..e6f4aa96f3e5 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 = -6522130490676809301L;
+    private static final long serialVersionUID = -6522130121312374513L;
 
     /** @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 0fb3277f427a..4e976c1488b3 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 = 7620289499038395368L;
+    private static final long serialVersionUID = 7620289450128353804L;
 
     /** @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 17322def1442..f9d94f16eaeb 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 = -164170091878692394L;
+    private static final long serialVersionUID = 3719310863730908118L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/LargeStruct.java b/slice2java/js/test/Ice/stream/Test/LargeStruct.java
index fb3196962698..8f414df3bf5c 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 = -5678216662235125243L;
+    private static final long serialVersionUID = 552022689637487590L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/MyClass.java b/slice2java/js/test/Ice/stream/Test/MyClass.java
index 660b18574999..47a84f9230bb 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 = 5358976962853278586L;
+    private static final long serialVersionUID = 8802871912804802814L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/stream/Test/MyException.java b/slice2java/js/test/Ice/stream/Test/MyException.java
index fe13cd0e6fb7..274e95136e75 100644
--- a/slice2java/js/test/Ice/stream/Test/MyException.java
+++ b/slice2java/js/test/Ice/stream/Test/MyException.java
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734227324504626613L;
+    private static final long serialVersionUID = 5734227301481658924L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/Ice/stream/Test/OptionalClass.java
index 7ed87424c82e..60dd2fa49424 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 = -6654306868164187501L;
+    private static final long serialVersionUID = -752338980251374951L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/Clash/Cls.java b/slice2java/js/test/Slice/escape/Clash/Cls.java
index 9b65b1c7976e..ad9fe2c8bb58 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 = -7965484311796795864L;
+    private static final long serialVersionUID = -2379858897946727752L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/Clash/Ex.java b/slice2java/js/test/Slice/escape/Clash/Ex.java
index 49f076c402b3..e53f9735df15 100644
--- a/slice2java/js/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/js/test/Slice/escape/Clash/Ex.java
@@ -77,5 +77,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3242147028104352747L;
+    private static final long serialVersionUID = -4624584252352773371L;
 }
diff --git a/slice2java/js/test/Slice/escape/Clash/St.java b/slice2java/js/test/Slice/escape/Clash/St.java
index e960d0e4fb74..52a86ecdfbc5 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 = 5036379402023953842L;
+    private static final long serialVersionUID = 2283107698379446578L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/BaseMethods.java b/slice2java/js/test/Slice/escape/await/BaseMethods.java
index 2c64cc32f1db..541abb2bb110 100644
--- a/slice2java/js/test/Slice/escape/await/BaseMethods.java
+++ b/slice2java/js/test/Slice/escape/await/BaseMethods.java
@@ -147,5 +147,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7232105524634254818L;
+    private static final long serialVersionUID = 6882492803238924119L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/_break.java b/slice2java/js/test/Slice/escape/await/_break.java
index 8b4f073550c6..0c673eeca99c 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 = 9042881512219661271L;
+    private static final long serialVersionUID = 2812742479978947202L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/_package.java b/slice2java/js/test/Slice/escape/await/_package.java
index 7dc4dec9c906..906050ac8e4d 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 = 3287884798180619054L;
+    private static final long serialVersionUID = 4819316419595080558L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/await/delete.java b/slice2java/js/test/Slice/escape/await/delete.java
index 4e37de5ddfb2..d15289d24c38 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 = -7868878309130602729L;
+    private static final long serialVersionUID = -5860094482042559870L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/await/fixed.java b/slice2java/js/test/Slice/escape/await/fixed.java
index 7e51c60e5d92..16aaaa26016a 100644
--- a/slice2java/js/test/Slice/escape/await/fixed.java
+++ b/slice2java/js/test/Slice/escape/await/fixed.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3808656764759721753L;
+    private static final long serialVersionUID = 3808658267888350956L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/foreach.java b/slice2java/js/test/Slice/escape/await/foreach.java
index b43a4b028289..e52b0a33bae6 100644
--- a/slice2java/js/test/Slice/escape/await/foreach.java
+++ b/slice2java/js/test/Slice/escape/await/foreach.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8220348100320971593L;
+    private static final long serialVersionUID = -568005572713642551L;
 }
diff --git a/slice2java/js/test/Slice/macros/Test/Default.java b/slice2java/js/test/Slice/macros/Test/Default.java
index 90bc00c3ca98..29cfe2356769 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 = -5162713983812588770L;
+    private static final long serialVersionUID = 969904581699940734L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/macros/Test/NoDefault.java b/slice2java/js/test/Slice/macros/Test/NoDefault.java
index 4379fb06d086..17952e304e52 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 = -5437198943577586817L;
+    private static final long serialVersionUID = -8331086270073456097L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java
index 1753a1b54042..b47c80e1aa10 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 = 6531447569874920942L;
+    private static final long serialVersionUID = 3913570950535477486L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 201667748c45..46b24484bb8b 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 = -3934244128737090446L;
+    private static final long serialVersionUID = 7356106114648440306L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index fd25439bbf59..ce3a130a0569 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 = 4114169409854262048L;
+    private static final long serialVersionUID = -563345055924943404L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java
index 94a75abf2b26..e3556cb34701 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 = 193628633743159478L;
+    private static final long serialVersionUID = -3015503353438974346L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java
index 4f910aea1844..1dc002fc27f3 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 = 5127391855804325799L;
+    private static final long serialVersionUID = 5127388778312263827L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java
index 805ac6eb0ac2..0e7adcf73385 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 = 3348938096062388472L;
+    private static final long serialVersionUID = -206782646870695944L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java
index 1a7d25d6a98e..7fc50c486268 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 = -8624370667748760171L;
+    private static final long serialVersionUID = -574984470044625707L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java
index b160b094b6c6..42b677e0ebda 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 = -3829640390937203517L;
+    private static final long serialVersionUID = -3383431378329553481L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/A.java b/slice2java/matlab/test/Ice/exceptions/Test/A.java
index 7732b52a3ee7..2f1af29798f8 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/A.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/A.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823737786331026859L;
+    private static final long serialVersionUID = 7823737823861725132L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/B.java b/slice2java/matlab/test/Ice/exceptions/Test/B.java
index 3cc5a05da96a..01abc5c427e1 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/B.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/B.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861412822176389653L;
+    private static final long serialVersionUID = -3861412454333487348L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/C.java b/slice2java/matlab/test/Ice/exceptions/Test/C.java
index 4a2a09066a7a..de72cfce3081 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/C.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/C.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080691477533812139L;
+    private static final long serialVersionUID = 1080691515064510412L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/D.java b/slice2java/matlab/test/Ice/exceptions/Test/D.java
index 28d93e569818..cba7045612a1 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/D.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/D.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780379445925688555L;
+    private static final long serialVersionUID = 4780379813768590860L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/E.java b/slice2java/matlab/test/Ice/exceptions/Test/E.java
index ef180a213137..9fc9f0db0e62 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/E.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/E.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1876971623463200534L;
+    private static final long serialVersionUID = -1876971255316216627L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/F.java b/slice2java/matlab/test/Ice/exceptions/Test/F.java
index c66db8793690..0f995e7efecf 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/F.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/F.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 733472186576300585L;
+    private static final long serialVersionUID = 733472139017665870L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java
index 1a52f38c6be2..af38a4eb324d 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641411491139591361L;
+    private static final long serialVersionUID = -4641411773892949416L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java
index 533c39e7c6d6..a6586e00b3de 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 = -8471300278904722936L;
+    private static final long serialVersionUID = -8471297564254261390L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java
index 165548f28f82..ae85e7100ae8 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 = 8898652016967595298L;
+    private static final long serialVersionUID = 8898654729065647502L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java
index 87595ed67cb5..1f0db7b693ae 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 = 4040525543601236603L;
+    private static final long serialVersionUID = 4040517544156080142L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java
index 4f0f048d1ede..0264d4034e24 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 = 5383251274419999327L;
+    private static final long serialVersionUID = 5383243068529675399L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java
index 428011256fd2..2f103648abda 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 = 4057364045414080711L;
+    private static final long serialVersionUID = 4057361294381435070L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java
index a1c718aa915e..054693fc6a53 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 = -1044055781579857254L;
+    private static final long serialVersionUID = -1044058661491557038L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java
index 5f8a2bcd1c6d..e09ab9dcc0ee 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 = -1862551204923692658L;
+    private static final long serialVersionUID = -1862553917096702323L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java
index e4d3066cc41d..e41c6b7ec962 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 = -2187164728778395670L;
+    private static final long serialVersionUID = -2187167647546205886L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java
index c0b0397bf4d5..8083c19685a9 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 = 825692125541653805L;
+    private static final long serialVersionUID = -779172356879525444L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java
index 1a41ca6cef16..af5e360897b9 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 = -5145825069403992328L;
+    private static final long serialVersionUID = -5145816904755368490L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java
index 4a7025826f7e..40c9d9d01c73 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 = 3347995416708142042L;
+    private static final long serialVersionUID = 3347998172685381174L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java
index 27f594734dc6..407162d8f754 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 = -9162150265389522719L;
+    private static final long serialVersionUID = -9162153019003093484L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java
index 35c3680d241c..25cf78aedec6 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 = -2752860961907129373L;
+    private static final long serialVersionUID = -2752858038127775045L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java
index a8142b25e469..b1b2ac9e520f 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 = -6601217498524486307L;
+    private static final long serialVersionUID = -6601225495389291612L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java
index 8067b95bc868..2681b9d79dda 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 = 3216394219414677666L;
+    private static final long serialVersionUID = 3216391460793549162L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java
index 56e12ad4ac3d..d7b572d2dbc8 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 = -3218143211077423660L;
+    private static final long serialVersionUID = -3218151411958463273L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java
index 143127d90200..fdba8a77e3f4 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 = 4560073226352483038L;
+    private static final long serialVersionUID = 4560081262082322614L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java
index 3cb5ebc44658..bf964470041f 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 = 3374695536063321651L;
+    private static final long serialVersionUID = 4364201560849948275L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/A.java b/slice2java/matlab/test/Ice/objects/Test/A.java
index 12903c05d63b..ccfe7d6eb6ea 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 = -5977891369825107439L;
+    private static final long serialVersionUID = 1865283499410097553L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/A1.java b/slice2java/matlab/test/Ice/objects/Test/A1.java
index 014c814376b8..0b954081c7fd 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 = -5926743293546984495L;
+    private static final long serialVersionUID = -5926745826039597047L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/B.java b/slice2java/matlab/test/Ice/objects/Test/B.java
index b18962eb0fc4..187000ef9e5d 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 = -8890910160024575072L;
+    private static final long serialVersionUID = -8890919033782624008L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/B1.java b/slice2java/matlab/test/Ice/objects/Test/B1.java
index b9462decdb86..02631c9ce572 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 = 3042130149608348292L;
+    private static final long serialVersionUID = 2887707833820420868L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Base.java b/slice2java/matlab/test/Ice/objects/Test/Base.java
index 0e07f7c61cc7..5564bed728e4 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 = -1277584507436201143L;
+    private static final long serialVersionUID = 4631082232804554313L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/C.java b/slice2java/matlab/test/Ice/objects/Test/C.java
index 6f1c2b8ddcd9..7c2de75ad752 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 = -3855667604350778945L;
+    private static final long serialVersionUID = 5739853524842636391L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/COneMember.java b/slice2java/matlab/test/Ice/objects/Test/COneMember.java
index 88df14a61ca6..808817dab4d8 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 = 3050968850809772471L;
+    private static final long serialVersionUID = 3050977559254083567L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java
index d905f228fb7c..5201955c172e 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 = -8205756044263740517L;
+    private static final long serialVersionUID = -3465565056361511397L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/D.java b/slice2java/matlab/test/Ice/objects/Test/D.java
index fd9a8aa03d9e..a45a92eafeaa 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 = 6351591969658347861L;
+    private static final long serialVersionUID = -6970610418234293875L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/D1.java b/slice2java/matlab/test/Ice/objects/Test/D1.java
index d44b39abe707..7040f1931f4b 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 = 8189071021561725763L;
+    private static final long serialVersionUID = -754606880652783421L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/E.java b/slice2java/matlab/test/Ice/objects/Test/E.java
index 062df163bfb4..1f1b7acb368a 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 = -3081171562873706934L;
+    private static final long serialVersionUID = -2348567466800492598L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/EBase.java b/slice2java/matlab/test/Ice/objects/Test/EBase.java
index fed833f0886c..112a885ef5df 100644
--- a/slice2java/matlab/test/Ice/objects/Test/EBase.java
+++ b/slice2java/matlab/test/Ice/objects/Test/EBase.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5410425625391866958L;
+    private static final long serialVersionUID = -6271468256156110898L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/EDerived.java b/slice2java/matlab/test/Ice/objects/Test/EDerived.java
index 61f44fbb9ef0..98e79cf991df 100644
--- a/slice2java/matlab/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/matlab/test/Ice/objects/Test/EDerived.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9206675819676974L;
+    private static final long serialVersionUID = -180536160126295598L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java
index 84d455ba53b7..33a2523f9b12 100644
--- a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225284033193717896L;
+    private static final long serialVersionUID = -6225292702742118112L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java
index 74e5d02f6cb0..ba8f260bc4f4 100644
--- a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6652276578042992620L;
+    private static final long serialVersionUID = -3890029584994150764L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/F.java b/slice2java/matlab/test/Ice/objects/Test/F.java
index 4059937d49a9..1f631a1c677d 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 = -588608709767989167L;
+    private static final long serialVersionUID = 1775062249728935121L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/F1.java b/slice2java/matlab/test/Ice/objects/Test/F1.java
index f8ee0bed428d..9261fd78757f 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 = 6192373545586444679L;
+    private static final long serialVersionUID = 6192380872027131871L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/F3.java b/slice2java/matlab/test/Ice/objects/Test/F3.java
index 8fa72615f506..2ff58641ef43 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 = -3015885455529611579L;
+    private static final long serialVersionUID = -4156909791310208187L;
 
     /** @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 0be2d9752e3d..bdd2fccfb718 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 = -1425258247388020406L;
+    private static final long serialVersionUID = -1425260818782414702L;
 
     /** @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 02f5c066f0fc..4f8d392c61d8 100644
--- a/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337226409991607320L;
+    private static final long serialVersionUID = -2337229663275217360L;
 }
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 ef319e031646..f6a1dc02afb7 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 = -1298687556994673679L;
+    private static final long serialVersionUID = -1298678722257865431L;
 
     /** @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 0464d86b5712..083e534a8570 100644
--- a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842229978665148556L;
+    private static final long serialVersionUID = 1842237966318462164L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/K.java b/slice2java/matlab/test/Ice/objects/Test/K.java
index 07ef74b62cee..987db4c5e2b6 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 = 4645159079145429646L;
+    private static final long serialVersionUID = 4645162128219636694L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/L.java b/slice2java/matlab/test/Ice/objects/Test/L.java
index 3247a67e12c8..bfdac6ed2948 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 = 6629747496622189338L;
+    private static final long serialVersionUID = 6629738661765610562L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/M.java b/slice2java/matlab/test/Ice/objects/Test/M.java
index 873bbeb0c46b..21faaca930d9 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 = -8088105658541708901L;
+    private static final long serialVersionUID = -8088097466684584381L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Recursive.java b/slice2java/matlab/test/Ice/objects/Test/Recursive.java
index 9dbd51b2edd7..17ba8044689b 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 = 3617886084887189853L;
+    private static final long serialVersionUID = 3617877211134806533L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/S.java b/slice2java/matlab/test/Ice/objects/Test/S.java
index 8b587f831b04..914f4d8f9eca 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 = 481774731537681449L;
+    private static final long serialVersionUID = 481771478253792881L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java
index 4065c2d76f0e..14294c255cca 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 = 6227744966878316142L;
+    private static final long serialVersionUID = 6227753119839808310L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java
index 5cfb740edf96..69559cb4fa16 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 = -8330046607055528062L;
+    private static final long serialVersionUID = -6250470092721355262L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/StructKey.java b/slice2java/matlab/test/Ice/objects/Test/StructKey.java
index fe2a7064b08a..e5db44937044 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 = 6173721251281377670L;
+    private static final long serialVersionUID = -2947533478082549242L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java
index 84f11a0ae56b..902b7bbb88f2 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 = 2723846369316322786L;
+    private static final long serialVersionUID = 2723843641740572066L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java
index 302fa352dc64..34da4f51ab36 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 = 883058499366812787L;
+    private static final long serialVersionUID = -1440554457417328205L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java
index 6923f0538431..a2bf3476c64c 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 = 723798750319399677L;
+    private static final long serialVersionUID = -5149178462303491203L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java
index c75f25ddaad1..4baa5d7dccb9 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 = -5948604169060299558L;
+    private static final long serialVersionUID = -8840768165683922662L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/Structure.java b/slice2java/matlab/test/Ice/operations/Test/Structure.java
index bac75be98119..a6a17aed5cdd 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 = -6269911369201614163L;
+    private static final long serialVersionUID = 4745798115255288045L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/A.java b/slice2java/matlab/test/Ice/optional/Test/A.java
index 6ade2df27c7e..41d8ae263c8d 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 = -4544686388932747504L;
+    private static final long serialVersionUID = 8814129183568463120L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/B.java b/slice2java/matlab/test/Ice/optional/Test/B.java
index dfdb7926d142..8bbb187f4352 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 = -6166708005654177437L;
+    private static final long serialVersionUID = 976744304030083875L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/C.java b/slice2java/matlab/test/Ice/optional/Test/C.java
index 093cf55b6072..979801c092f2 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 = 4386143947768220029L;
+    private static final long serialVersionUID = -5111455400000167875L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java
index 1cf93c52e230..b385758e2aaa 100644
--- a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java
@@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1176731935694873356L;
+    private static final long serialVersionUID = -905704438432671236L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/E.java b/slice2java/matlab/test/Ice/optional/Test/E.java
index e92d88d4e081..90b1302100a8 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 = -1850730443198995263L;
+    private static final long serialVersionUID = -1850734455617219765L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/F.java b/slice2java/matlab/test/Ice/optional/Test/F.java
index 662b49c41c2f..f3ce9ae282ed 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 = -6430490936656467662L;
+    private static final long serialVersionUID = -6430497514265806408L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java
index 871489ae5581..0c955f7caa66 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 = 1569616996884297423L;
+    private static final long serialVersionUID = 1569602073909650888L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/G.java b/slice2java/matlab/test/Ice/optional/Test/G.java
index 1c2b1d522b34..9d6bf1990cf5 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 = -4571072738345446253L;
+    private static final long serialVersionUID = -4296599691302805549L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/G1.java b/slice2java/matlab/test/Ice/optional/Test/G1.java
index 724aa5dfccca..cb4d8e2b7fa7 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 = 7339779901226059010L;
+    private static final long serialVersionUID = 7339783903509499186L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/G2.java b/slice2java/matlab/test/Ice/optional/Test/G2.java
index 239b678aa483..543ac4373a2e 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 = 3824560170134776822L;
+    private static final long serialVersionUID = 3824556157724239432L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java
index bdd23f2a8ad2..17c16a46fab2 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 = -4504799274587948619L;
+    private static final long serialVersionUID = -3234687085206935781L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java
index f24f31dfc36a..2721fb267b98 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 = -7219605416444741791L;
+    private static final long serialVersionUID = -7219598513482763290L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java
index 59a179afcccd..1ee2a34c60ba 100644
--- a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java
@@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7405974849860471778L;
+    private static final long serialVersionUID = -4947990775643329292L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java
index c0d0ee32f15a..b71b3d4313e5 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 = 2023538526022683131L;
+    private static final long serialVersionUID = -5578217717920786245L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java
index 7c2a32db4938..b0ade69fc4e5 100644
--- a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java
@@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894241944544026315L;
+    private static final long serialVersionUID = 2894237926817797307L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java
index e3a378aa37e1..823c091c78ff 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 = 6700995422697985773L;
+    private static final long serialVersionUID = 6700988519716093947L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java
index 43ae7c79e683..814b4d58df3c 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 = -1912288966357528438L;
+    private static final long serialVersionUID = -1912284964074645830L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/WD.java b/slice2java/matlab/test/Ice/optional/Test/WD.java
index fec12ffce3dc..7f16882b6c18 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 = 100582817323110723L;
+    private static final long serialVersionUID = -7136465074913147500L;
 
     /** @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 bce44d83572b..c73ed2dca954 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477016900488121661L;
+    private static final long serialVersionUID = -477023281717895019L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java
index 05f8b1c5a807..aa4d582f7c18 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 = -8435640947549865977L;
+    private static final long serialVersionUID = -8435630312378704815L;
 
     /** @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 75db55dc6d69..aae7c65b2514 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485210249622897381L;
+    private static final long serialVersionUID = 3485209814330628019L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 9fc34785f3d3..c956a050d23b 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717371178576680980L;
+    private static final long serialVersionUID = 1717377229190654274L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 6365900ec369..d81e5507be70 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384917110250918579L;
+    private static final long serialVersionUID = -7384912420998286949L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java
index ec22919a93c1..51637c49c32b 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2733702839281813368L;
+    private static final long serialVersionUID = -2733709380653614626L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
index 90bf039494ac..972107f4ec36 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4528108435084863041L;
+    private static final long serialVersionUID = 4528101893713061527L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java
index 92b809ba7d33..9265969f6b15 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java
@@ -74,5 +74,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6137362470902221900L;
+    private static final long serialVersionUID = 6137357290887482138L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java
index d05fda9b8792..7e852a39473d 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 751750149625533548L;
+    private static final long serialVersionUID = 751745300226593850L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java
index 4bbff1f2457b..eb4559c6085d 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 = -4272727605132710023L;
+    private static final long serialVersionUID = -4272737909688071121L;
 
     /** @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 4005444a75d5..58d9c0d42a3a 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 = -1228979860597590616L;
+    private static final long serialVersionUID = -2478140274579748857L;
 
     /** @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 76b9debfb900..a18c3fd67b34 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java
@@ -78,5 +78,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7194045074027889820L;
+    private static final long serialVersionUID = 730857806339125195L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java
index d1bc2c7126d0..237788d1db1e 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 = -6396993797116453808L;
+    private static final long serialVersionUID = -6397001195865067643L;
 
     /** @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 5c7ba37a618f..43a0a4c62ea6 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 = -9066889441212008056L;
+    private static final long serialVersionUID = -9066884772477229444L;
 
     /** @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 4a97f9f6a29c..7aa45ed8b738 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 = 7890497039934580267L;
+    private static final long serialVersionUID = -6176071009039648476L;
 
     /** @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 485521ffddc3..5a40032fce58 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 = -8321111215204218775L;
+    private static final long serialVersionUID = -3548850970397590426L;
 
     /** @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 344517cf64b6..df398057876e 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4599982274474149063L;
+    private static final long serialVersionUID = -6999224284345943999L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java
index c5a9d86a8e13..d0b9fe122118 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 = -7655931329418939291L;
+    private static final long serialVersionUID = -7655930542834222953L;
 
     /** @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 47353d7c5ff6..6faf352e1450 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 = -2271120530597047435L;
+    private static final long serialVersionUID = -2271121317024380980L;
 
     /** @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 77562b749b47..7c3a00b77d05 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 = 481717097380458538L;
+    private static final long serialVersionUID = 481709698586583931L;
 
     /** @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 8d6cc12dc78b..390536781380 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 = -4426878658943065712L;
+    private static final long serialVersionUID = -4426880767839017659L;
 
     /** @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 6bc09db32289..2f8aa323437f 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 = 850535664332617143L;
+    private static final long serialVersionUID = 850537773273830374L;
 
     /** @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 3f93ba2e024b..2275d2c4b2b2 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 = -4328907015467250483L;
+    private static final long serialVersionUID = -4328906228953238625L;
 
     /** @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 f69d96e2b5ac..a2b1c054f5aa 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 = -5081810268968757875L;
+    private static final long serialVersionUID = -5081802870064111224L;
 
     /** @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 ca24f2daf4db..37d87be0773c 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 = 643087951267490447L;
+    private static final long serialVersionUID = 643089729531506747L;
 
     /** @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 99b2d903cb07..9788351d8c58 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 = -2438005100736779582L;
+    private static final long serialVersionUID = -2437998693903892222L;
 
     /** @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 d7fd860877a8..b10b05266ab7 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 = 3651536902807340356L;
+    private static final long serialVersionUID = 3651536116374125761L;
 
     /** @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 eb7c801c2cde..fdd7237748f9 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 = 8804373834895813345L;
+    private static final long serialVersionUID = 8804375613156630244L;
 
     /** @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 844a994123f8..cbc38dcc9f2b 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 = -5353758456065219945L;
+    private static final long serialVersionUID = -5353757669489119854L;
 
     /** @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 6a0dd42519e8..276c6c05134c 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 = -6522143360133931135L;
+    private static final long serialVersionUID = -6522143981501822688L;
 
     /** @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 c3552a818471..0f7bf5ebb8dd 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 = 7620284642002872962L;
+    private static final long serialVersionUID = 7620281130331614051L;
 
     /** @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 6eccf065bb29..d8d54f6281a8 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 = 4829785759532226512L;
+    private static final long serialVersionUID = -1068917590390661552L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java
index b7561ce72d98..af2dadf20331 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 = -7212144915133070291L;
+    private static final long serialVersionUID = -2879047546980182483L;
 
     /** @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 1f8d2dbfd1bd..4c1f42a8bf96 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 = -6289683587852112321L;
+    private static final long serialVersionUID = 6333646175795358399L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java
index 3f0fe8f751cd..6bd96dbb72c9 100644
--- a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java
+++ b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2421494306942489535L;
+    private static final long serialVersionUID = 2421484435108388761L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java
index 22b01aeb4ca0..2b2d0e80e5fd 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 = 6251508340790402776L;
+    private static final long serialVersionUID = -5807935442181968130L;
 
     /** @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 70db7b955813..331ce5ee36b1 100644
--- a/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java
+++ b/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java
@@ -110,5 +110,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6554306713417700342L;
+    private static final long serialVersionUID = 8419499728094422774L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java
index c198f0aeae7c..4ee013c58708 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 = -7503305463477581647L;
+    private static final long serialVersionUID = 7432879246996985009L;
 
     /** @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 3a23b3cebd84..44bccf634350 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 = -1008943181843516514L;
+    private static final long serialVersionUID = -1008955616097405128L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Base.java b/slice2java/php/test/Ice/defaultValue/Test/Base.java
index 708010c63d2a..b676f4102a2e 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 = -4879616243951146484L;
+    private static final long serialVersionUID = -6607772507183121099L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java
index f5f5f1eb904b..5297a00fc379 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 = -530483058824615213L;
+    private static final long serialVersionUID = 718046285204092177L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index b9d0582bf10d..02794342f34a 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 = 5785811368131205726L;
+    private static final long serialVersionUID = -7686078176965900294L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Derived.java b/slice2java/php/test/Ice/defaultValue/Test/Derived.java
index a3cfc79ab97f..9254764ee717 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 = 2741942539766585834L;
+    private static final long serialVersionUID = -7562437823297885488L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java
index 23c79e885fb1..7a7d1f3b08e4 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 = 5127388842733795213L;
+    private static final long serialVersionUID = 5127389183662142832L;
 }
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java
index 1b373efdf0ff..778ceb6c4053 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 = -9011529467851345370L;
+    private static final long serialVersionUID = -4110163853917937083L;
 }
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java
index 05a908f987d2..1df43f1fa590 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 = 2857927099976241195L;
+    private static final long serialVersionUID = -1760382897213942089L;
 }
diff --git a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java
index 0b879d39f18d..bbb5b1fb139e 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 = 4734516685496848840L;
+    private static final long serialVersionUID = -8700385742103865224L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/A.java b/slice2java/php/test/Ice/exceptions/Test/A.java
index e4444428b673..5c0aaea80385 100644
--- a/slice2java/php/test/Ice/exceptions/Test/A.java
+++ b/slice2java/php/test/Ice/exceptions/Test/A.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823745264087085112L;
+    private static final long serialVersionUID = 7823746565677845932L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/B.java b/slice2java/php/test/Ice/exceptions/Test/B.java
index b91ff23fb55f..7425cad55d9a 100644
--- a/slice2java/php/test/Ice/exceptions/Test/B.java
+++ b/slice2java/php/test/Ice/exceptions/Test/B.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861410634576867592L;
+    private static final long serialVersionUID = -3861409167526269460L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/C.java b/slice2java/php/test/Ice/exceptions/Test/C.java
index ab63053c8a50..22aa37726fca 100644
--- a/slice2java/php/test/Ice/exceptions/Test/C.java
+++ b/slice2java/php/test/Ice/exceptions/Test/C.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080698955289870392L;
+    private static final long serialVersionUID = 1080700256880631212L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/D.java b/slice2java/php/test/Ice/exceptions/Test/D.java
index 37c75929c761..2b26c56b52be 100644
--- a/slice2java/php/test/Ice/exceptions/Test/D.java
+++ b/slice2java/php/test/Ice/exceptions/Test/D.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780381633525210616L;
+    private static final long serialVersionUID = 4780383100575808748L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/A.java b/slice2java/php/test/Ice/objects/Test/A.java
index 227ed5ea1dc8..7fcc8765ddca 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 = -488374577448276203L;
+    private static final long serialVersionUID = 6308541458287906517L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/A1.java b/slice2java/php/test/Ice/objects/Test/A1.java
index 8192e580fdf7..fb64d9d0d443 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 = -5926742133808889903L;
+    private static final long serialVersionUID = -5926738801814521844L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/B.java b/slice2java/php/test/Ice/objects/Test/B.java
index e58d7b3ae9a8..6dc9a92e3bd0 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 = -8890919915773467476L;
+    private static final long serialVersionUID = -8890911854417604239L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/B1.java b/slice2java/php/test/Ice/objects/Test/B1.java
index 5cb63c2316c7..b3976df8058b 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 = -4641802995395485180L;
+    private static final long serialVersionUID = 8706211254720483716L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/Base.java b/slice2java/php/test/Ice/objects/Test/Base.java
index 42de9e29a447..bd233434cfd3 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 = 6766030730950794511L;
+    private static final long serialVersionUID = -6842701636375871825L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/C.java b/slice2java/php/test/Ice/objects/Test/C.java
index 6fddf0ec8437..9f1217c55c9c 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 = -7512215705344371269L;
+    private static final long serialVersionUID = -4126932500841063930L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/COneMember.java b/slice2java/php/test/Ice/objects/Test/COneMember.java
index 78c046703be8..7b125fa4dbce 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 = 3050973151534156978L;
+    private static final long serialVersionUID = 3050965250209860271L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java
index 41a1028e2fe4..5eba85e6ea30 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 = -1690778622594345317L;
+    private static final long serialVersionUID = -4201997111073444197L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/D.java b/slice2java/php/test/Ice/objects/Test/D.java
index a7735d778e8e..cf02b58d2238 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 = -3068361139554144547L;
+    private static final long serialVersionUID = -4973645798239655392L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/D1.java b/slice2java/php/test/Ice/objects/Test/D1.java
index a19ae79a0691..aafc73de94fa 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 = -877580635860472893L;
+    private static final long serialVersionUID = -5708068573147121341L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/E.java b/slice2java/php/test/Ice/objects/Test/E.java
index 4305ed8d2327..11386badb9f9 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 = -5436718989003875638L;
+    private static final long serialVersionUID = 3735002735279634154L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/EBase.java b/slice2java/php/test/Ice/objects/Test/EBase.java
index 7b82af5b9957..6d85bc1e9080 100644
--- a/slice2java/php/test/Ice/objects/Test/EBase.java
+++ b/slice2java/php/test/Ice/objects/Test/EBase.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4319132770683542066L;
+    private static final long serialVersionUID = -1654249360925081266L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/EDerived.java b/slice2java/php/test/Ice/objects/Test/EDerived.java
index 7f10702d6828..002c05c89ffd 100644
--- a/slice2java/php/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/php/test/Ice/objects/Test/EDerived.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9113828836394171474L;
+    private static final long serialVersionUID = -6151870374028648750L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/EOneMember.java b/slice2java/php/test/Ice/objects/Test/EOneMember.java
index 0b9b7265b87a..3d67a276f94f 100644
--- a/slice2java/php/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/php/test/Ice/objects/Test/EOneMember.java
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225288333578822275L;
+    private static final long serialVersionUID = -6225280393733579168L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java
index 33564c22e42f..2beea5ff770a 100644
--- a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 301178415406349076L;
+    private static final long serialVersionUID = 5800305519274880020L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/F.java b/slice2java/php/test/Ice/objects/Test/F.java
index 12c461697913..89dfb905c73a 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 = -7616676344112650031L;
+    private static final long serialVersionUID = -8493190030107695215L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/F1.java b/slice2java/php/test/Ice/objects/Test/F1.java
index 5407be8976cf..7cd725683d15 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 = 6192372704781592860L;
+    private static final long serialVersionUID = 6192366030473011018L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/F3.java b/slice2java/php/test/Ice/objects/Test/F3.java
index ffcf2486766a..dd3c90360d00 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 = 5462862352497348295L;
+    private static final long serialVersionUID = 4111524854685006279L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/K.java b/slice2java/php/test/Ice/objects/Test/K.java
index ccda955ca6e4..2fda8a97d041 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 = 4645163374564035831L;
+    private static final long serialVersionUID = 4645160894715045674L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/L.java b/slice2java/php/test/Ice/objects/Test/L.java
index d92740fbb22e..d3668cdd3ab3 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 = 6629735095946892570L;
+    private static final long serialVersionUID = 6629743198780193607L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/Recursive.java b/slice2java/php/test/Ice/objects/Test/Recursive.java
index 9afa776f09e7..a5b73bec61ce 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 = 3617879139309245726L;
+    private static final long serialVersionUID = 3617887208299780739L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/S.java b/slice2java/php/test/Ice/objects/Test/S.java
index ef42222ee6d8..0e4a15ae7fa8 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 = 481770436115074985L;
+    private static final long serialVersionUID = 481773042313432436L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/SOneMember.java b/slice2java/php/test/Ice/objects/Test/SOneMember.java
index 83a68859c24c..9ee11474c75f 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 = 6227757367573830123L;
+    private static final long serialVersionUID = 6227748582809396854L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/STwoMembers.java b/slice2java/php/test/Ice/objects/Test/STwoMembers.java
index d4589bdf9c12..51b6e080c284 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 = 3400289075512883842L;
+    private static final long serialVersionUID = 6622913167671958402L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java
index b4678c3f1632..136f9e3b32dc 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 = 2723850483942214376L;
+    private static final long serialVersionUID = 2723843444210366530L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/MyClass1.java b/slice2java/php/test/Ice/operations/Test/MyClass1.java
index fd9929741da2..9a3a539a67b6 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 = 6495418158859094974L;
+    private static final long serialVersionUID = -2062290043052979860L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/operations/Test/MyStruct1.java b/slice2java/php/test/Ice/operations/Test/MyStruct1.java
index e31e72198fd1..a2716d80a583 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 = -7217176033542968969L;
+    private static final long serialVersionUID = 1255579790361699621L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/Structure.java b/slice2java/php/test/Ice/operations/Test/Structure.java
index 6652d912aa81..c26c2ef80939 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 = 8391387040047583229L;
+    private static final long serialVersionUID = -5291217056572573832L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/A.java b/slice2java/php/test/Ice/optional/Test/A.java
index 0add8cf6deab..a91db1a73104 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 = -1360535422270482416L;
+    private static final long serialVersionUID = 4719658565082434576L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/B.java b/slice2java/php/test/Ice/optional/Test/B.java
index 11a91a9eec52..90ee1674fdd2 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 = 3843590629118709923L;
+    private static final long serialVersionUID = -1407562936666508701L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/C.java b/slice2java/php/test/Ice/optional/Test/C.java
index 4dd2b5a93969..3ecbb84f7eb5 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 = -2011870241333654467L;
+    private static final long serialVersionUID = 1662082144489709949L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/DerivedException.java b/slice2java/php/test/Ice/optional/Test/DerivedException.java
index 6b0f74c6faa3..cb82a113b412 100644
--- a/slice2java/php/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/php/test/Ice/optional/Test/DerivedException.java
@@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8482009609044183200L;
+    private static final long serialVersionUID = 8643450628259818828L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/E.java b/slice2java/php/test/Ice/optional/Test/E.java
index 094cd92c3540..d9d397cb0773 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 = -1850732528848358510L;
+    private static final long serialVersionUID = -1850731349814251135L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/F.java b/slice2java/php/test/Ice/optional/Test/F.java
index b9e0ba05c54a..2c09f8af9ac4 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 = -6430494301162792095L;
+    private static final long serialVersionUID = -6430490030041211790L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/FixedStruct.java b/slice2java/php/test/Ice/optional/Test/FixedStruct.java
index 7d91d49e8e3c..6744ace29679 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 = 1569613544713540882L;
+    private static final long serialVersionUID = 1569609477957636355L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/G.java b/slice2java/php/test/Ice/optional/Test/G.java
index 253f77877b1b..4b80e474a070 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 = -3492039903448753197L;
+    private static final long serialVersionUID = -82545607709509933L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/G1.java b/slice2java/php/test/Ice/optional/Test/G1.java
index b4f3add7fe28..3ee130956f50 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 = 7339783353237960878L;
+    private static final long serialVersionUID = 7339787420157316162L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/G2.java b/slice2java/php/test/Ice/optional/Test/G2.java
index c3c16ae99986..63e63a44d7bd 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 = 3824558084489996082L;
+    private static final long serialVersionUID = 3824559263524322927L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/MultiOptional.java b/slice2java/php/test/Ice/optional/Test/MultiOptional.java
index 8f0cfe85fd78..fb54d5776134 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 = 8610620456863653647L;
+    private static final long serialVersionUID = 2851775554717793537L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/OneOptional.java b/slice2java/php/test/Ice/optional/Test/OneOptional.java
index 1196b7add303..5f00efb9bedb 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 = -7219608698146606020L;
+    private static final long serialVersionUID = -7219607320068382803L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/OptionalException.java b/slice2java/php/test/Ice/optional/Test/OptionalException.java
index 5e7d409ee23b..64aff18e672e 100644
--- a/slice2java/php/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/php/test/Ice/optional/Test/OptionalException.java
@@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7462348296529192606L;
+    private static final long serialVersionUID = -1735001456212333522L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java
index 2de82536e335..e4296ac3add3 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 = -8318636857465495301L;
+    private static final long serialVersionUID = 7040717219480790395L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/RequiredException.java b/slice2java/php/test/Ice/optional/Test/RequiredException.java
index 8628b3364bd8..fa91f33ba08a 100644
--- a/slice2java/php/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/php/test/Ice/optional/Test/RequiredException.java
@@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894245474204577959L;
+    private static final long serialVersionUID = 2894241363388181643L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/SmallStruct.java b/slice2java/php/test/Ice/optional/Test/SmallStruct.java
index f4126982bf9f..49c1df67ebf3 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 = 6700991892878105994L;
+    private static final long serialVersionUID = 6700996003858430125L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/VarStruct.java b/slice2java/php/test/Ice/optional/Test/VarStruct.java
index f6d3e46a93a9..0a9c006796e7 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 = -1912285514346200538L;
+    private static final long serialVersionUID = -1912281447426271286L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/WD.java b/slice2java/php/test/Ice/optional/Test/WD.java
index cf4f92bdb001..c7e57ce6955b 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 = 4505032808044872466L;
+    private static final long serialVersionUID = 3562253074235860815L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C.java b/slice2java/php/test/Ice/scope/Test/C.java
index ae10e1c5341a..da43632e138d 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 = -5190250197862878683L;
+    private static final long serialVersionUID = -5190251976130336109L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C1.java b/slice2java/php/test/Ice/scope/Test/C1.java
index 7587b1fedd44..5334cf692997 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 = 8893230319503680473L;
+    private static final long serialVersionUID = 8893238043851594942L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C2.java b/slice2java/php/test/Ice/scope/Test/C2.java
index 7fd4043fab92..8e88688e2dc3 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 = 8915101902255056883L;
+    private static final long serialVersionUID = 839591000176143392L;
 
     /** @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 a9e898fd4503..25096339eaf0 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 = 4615625762531684459L;
+    private static final long serialVersionUID = 4615624815943189615L;
 
     /** @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 89704172bc12..a2ea7b0ae1bc 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 = 672580530590222478L;
+    private static final long serialVersionUID = 672596445246513074L;
 
     /** @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 293b5382fb4d..33ed92a427f8 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 = 8654442149744313178L;
+    private static final long serialVersionUID = 8654434590850825170L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/Inner/S.java b/slice2java/php/test/Ice/scope/Test/Inner/S.java
index c93ae0b67dc6..831226591b70 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 = 3694613055804120854L;
+    private static final long serialVersionUID = 3694622358326209950L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S.java b/slice2java/php/test/Ice/scope/Test/S.java
index e5c4f1cd8079..045cd9d72150 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 = 2159705663908272488L;
+    private static final long serialVersionUID = 2159704546705499104L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S1.java b/slice2java/php/test/Ice/scope/Test/S1.java
index b0204fed4278..f11f9b4a148e 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 = 1241672000197448672L;
+    private static final long serialVersionUID = 1241675511602743303L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S2.java b/slice2java/php/test/Ice/scope/Test/S2.java
index dd08401a503a..16d23aa2ff3b 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 = 7083381181063759370L;
+    private static final long serialVersionUID = -3484883027703784231L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java
index 170158ed77df..539f0664a04c 100644
--- a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477023780217083327L;
+    private static final long serialVersionUID = -477021575462514026L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 7e463ad2c596..9b89a48200db 100644
--- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485214445527842151L;
+    private static final long serialVersionUID = 3485210874533770928L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 7690689bd77f..9a92366d219d 100644
--- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717377892997185046L;
+    private static final long serialVersionUID = 1717375853683913921L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 014c96f0ca88..cd3d2cc6418e 100644
--- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384918534814017329L;
+    private static final long serialVersionUID = -7384921945334717032L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/B.java b/slice2java/php/test/Ice/slicing/objects/Test/B.java
index 1d4d074b6cc4..15c95b14bac5 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 = 8157476229680506528L;
+    private static final long serialVersionUID = -3063139629269713262L;
 
     /** @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 d02cea4a03f7..fdff304abe8b 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java
@@ -78,5 +78,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4517302030115631252L;
+    private static final long serialVersionUID = -1917744858345954850L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 0e8102b70adb..1c087c5cd206 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 = -6397005100158925232L;
+    private static final long serialVersionUID = -6396993816529822799L;
 
     /** @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 ec6a690fde9e..8b2da10c3d23 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 = -9066887860179642422L;
+    private static final long serialVersionUID = -9066887983096093325L;
 
     /** @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 fef689e6a120..78a785d79587 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 = 5861383192805174019L;
+    private static final long serialVersionUID = -7189443319190355055L;
 
     /** @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 e60992a3fcfc..670b23da6fcf 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 = -8170707017622243011L;
+    private static final long serialVersionUID = -2863316665561736291L;
 
     /** @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 dc93d5447d26..6182b861e517 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5391073344790112616L;
+    private static final long serialVersionUID = -2843209851577580752L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java
index ecfaaed64166..68788f75d33c 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 = -7655927139829719790L;
+    private static final long serialVersionUID = -7655927017290548057L;
 
     /** @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 07adedf3f2ec..6f3ad37d6fc4 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 = -2271124885315973587L;
+    private static final long serialVersionUID = -2271124842623827026L;
 
     /** @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 1bd1f28ced83..924615ce6ddc 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 = 481712868898613594L;
+    private static final long serialVersionUID = 481712911590685979L;
 
     /** @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 0f92beced716..57c01c63ffe3 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 = -4426884837137179760L;
+    private static final long serialVersionUID = -4426878843664473871L;
 
     /** @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 ad4892e51362..3e6f4a1884b3 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 = 850536387606983493L;
+    private static final long serialVersionUID = 850535683683343588L;
 
     /** @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 c1b585597208..2dddf172a649 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 = -4328902198463097241L;
+    private static final long serialVersionUID = -4328906869472463482L;
 
     /** @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 377c032251ab..3b37d82f81de 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 = -5081815000744176268L;
+    private static final long serialVersionUID = -5081810414814947627L;
 
     /** @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 982bcac74e6d..4ac5cd8f8c09 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 = 643086244049680717L;
+    private static final long serialVersionUID = 643086201357997492L;
 
     /** @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 737cfb1d573d..c081830cd611 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 = -2438001066371626109L;
+    private static final long serialVersionUID = -2438000943445867004L;
 
     /** @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 fdb1b28759c2..abc156615d45 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 = 3651532547959481605L;
+    private static final long serialVersionUID = 3651532590651288386L;
 
     /** @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 d6d92230afb2..60381e08e6fe 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 = 8804372447845956000L;
+    private static final long serialVersionUID = 8804372405154018663L;
 
     /** @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 92f0ad9d99d7..25e8aaacb0fb 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 = -5353754586836925866L;
+    private static final long serialVersionUID = -5353754464069304815L;
 
     /** @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 620e27f83d3e..6a276722aee4 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 = -6522141614002098534L;
+    private static final long serialVersionUID = -6522141736770683473L;
 
     /** @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 f7097d151cb9..9011dc2316d8 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 = 7620283420193958169L;
+    private static final long serialVersionUID = 7620283377489422188L;
 
     /** @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 d0addb9fd28f..2a355a48ea2c 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 = 1644639678576639263L;
+    private static final long serialVersionUID = 6825132747922904790L;
 }
diff --git a/slice2java/php/test/Slice/escape/Clash/Cls.java b/slice2java/php/test/Slice/escape/Clash/Cls.java
index c20137a6dab5..0cb8d067d0cd 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 = -3363777829668022655L;
+    private static final long serialVersionUID = 5449457546846459576L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/escape/Clash/Ex.java b/slice2java/php/test/Slice/escape/Clash/Ex.java
index aebc7d8e8992..5133efd7bbe4 100644
--- a/slice2java/php/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/php/test/Slice/escape/Clash/Ex.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3765014368053455809L;
+    private static final long serialVersionUID = -5120183122539782529L;
 }
diff --git a/slice2java/php/test/Slice/escape/Clash/St.java b/slice2java/php/test/Slice/escape/Clash/St.java
index 0c9653d25468..48341078b227 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 = 3429101509363945895L;
+    private static final long serialVersionUID = -1712245092478856034L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/echo.java b/slice2java/php/test/Slice/escape/and/echo.java
index 0ea158fea469..303db58a9f2d 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 = -485984137772593018L;
+    private static final long serialVersionUID = 4702637324081133094L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/escape/and/endif.java b/slice2java/php/test/Slice/escape/and/endif.java
index d0a2242ddc71..e3f6fd726a87 100644
--- a/slice2java/php/test/Slice/escape/and/endif.java
+++ b/slice2java/php/test/Slice/escape/and/endif.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3766560565073811909L;
+    private static final long serialVersionUID = -3766557860737654424L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/endwhile.java b/slice2java/php/test/Slice/escape/and/endwhile.java
index 86baaf11935f..c33980a47203 100644
--- a/slice2java/php/test/Slice/escape/and/endwhile.java
+++ b/slice2java/php/test/Slice/escape/and/endwhile.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -296468765030405714L;
+    private static final long serialVersionUID = 5662117948762603310L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/xor.java b/slice2java/php/test/Slice/escape/and/xor.java
index 9b7b0ac98a01..ad0c1dc6cce5 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 = -778002193675740744L;
+    private static final long serialVersionUID = 5175694096365587211L;
 }
diff --git a/slice2java/php/test/Slice/macros/Test/Default.java b/slice2java/php/test/Slice/macros/Test/Default.java
index 93ebd0e04202..650b3fe85321 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 = -1869298882095657026L;
+    private static final long serialVersionUID = -8794812103839719842L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/macros/Test/NoDefault.java b/slice2java/php/test/Slice/macros/Test/NoDefault.java
index a356d441c726..83538684a632 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 = -7213936016696393377L;
+    private static final long serialVersionUID = 7276844787908322623L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/structure/Test/C.java b/slice2java/php/test/Slice/structure/Test/C.java
index 41ee9873faa0..96b1281b3542 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 = -3172274548959499846L;
+    private static final long serialVersionUID = -3172273564855448434L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/structure/Test/S1.java b/slice2java/php/test/Slice/structure/Test/S1.java
index 9476d267fb92..7a28e5786513 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 = -5542861974893523666L;
+    private static final long serialVersionUID = -5542866451107420768L;
 }
diff --git a/slice2java/php/test/Slice/structure/Test/S2.java b/slice2java/php/test/Slice/structure/Test/S2.java
index ebbef0bcde21..d102baea4a75 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 = -7079571843921475970L;
+    private static final long serialVersionUID = 8406491099431646547L;
 }
diff --git a/slice2java/python/test/Glacier2/router/Test/CallbackException.java b/slice2java/python/test/Glacier2/router/Test/CallbackException.java
index 0b6f3d6a4119..df52d65ad220 100644
--- a/slice2java/python/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/python/test/Glacier2/router/Test/CallbackException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8305193285064260298L;
+    private static final long serialVersionUID = -6617164663111284866L;
 }
diff --git a/slice2java/python/test/Ice/custom/Test/C.java b/slice2java/python/test/Ice/custom/Test/C.java
index b0a941d70135..c1d84f473d00 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 = -7744058101208107689L;
+    private static final long serialVersionUID = 2184220043747945431L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/custom/Test/D.java b/slice2java/python/test/Ice/custom/Test/D.java
index 0935eed12d6f..0e930bfb8e61 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 = -192162144974413376L;
+    private static final long serialVersionUID = 6194861402159660890L;
 
     /** @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 1b5cd8c97219..84c142d9b4e2 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 = -6786569517795031009L;
+    private static final long serialVersionUID = -7526541796534949933L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/custom/Test/S.java b/slice2java/python/test/Ice/custom/Test/S.java
index 280b1e03001d..9dd183741b3e 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 = 6265138962200911982L;
+    private static final long serialVersionUID = 4580687036483302510L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Base.java b/slice2java/python/test/Ice/defaultValue/Test/Base.java
index b28c22f678a4..5946b1d8d999 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 = -4647402294172641400L;
+    private static final long serialVersionUID = 4748838941456878126L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java
index 26e9b1298329..3ad90329125f 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java
@@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6567654594680993860L;
+    private static final long serialVersionUID = 5592510295886379354L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 1560c430dcab..3c89f4081a0e 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 = -5360032266080021182L;
+    private static final long serialVersionUID = -6755124107569788402L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 2d4fac482b6a..670a2b60fb4a 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 = 2993048573759098037L;
+    private static final long serialVersionUID = -8876184230005867969L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Derived.java b/slice2java/python/test/Ice/defaultValue/Test/Derived.java
index b96f955f2305..a50d43002ec5 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 = 7522483780372364598L;
+    private static final long serialVersionUID = 8035052117207675062L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java
index cdad04ad992a..a90ea8fe3475 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java
@@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2444421527351711615L;
+    private static final long serialVersionUID = 3857425546554892161L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index e1a652c9df92..daebb78ff9ae 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9005132323127716902L;
+    private static final long serialVersionUID = -6059810543455539478L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index 7b1b5dc6f309..42ae20327ede 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
@@ -79,5 +79,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 779501780567312197L;
+    private static final long serialVersionUID = -7610372428132483633L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java
index 38d832776c97..c4c710db38a3 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 = 5127393658589775526L;
+    private static final long serialVersionUID = 5127385333890938721L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java
index 6598108f7718..6c6fa94a907e 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 = 7334210622411142462L;
+    private static final long serialVersionUID = -6675297052876621448L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java
index 60d4035e2f7b..53f10fe06833 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 = 9204858114849067961L;
+    private static final long serialVersionUID = 551492118766015829L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java
index fc52e6ee7362..2dd6c54fe591 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 = 3261374832634935253L;
+    private static final long serialVersionUID = 7241999727661317215L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/A.java b/slice2java/python/test/Ice/exceptions/Test/A.java
index d51946a482f7..4474f91a3d2b 100644
--- a/slice2java/python/test/Ice/exceptions/Test/A.java
+++ b/slice2java/python/test/Ice/exceptions/Test/A.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823737281449921902L;
+    private static final long serialVersionUID = 7823738304325824409L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/B.java b/slice2java/python/test/Ice/exceptions/Test/B.java
index a64ebff853df..c8d898c600d2 100644
--- a/slice2java/python/test/Ice/exceptions/Test/B.java
+++ b/slice2java/python/test/Ice/exceptions/Test/B.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861418616910295890L;
+    private static final long serialVersionUID = -3861417429030088871L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/C.java b/slice2java/python/test/Ice/exceptions/Test/C.java
index 25956c3f3c78..5727f792a927 100644
--- a/slice2java/python/test/Ice/exceptions/Test/C.java
+++ b/slice2java/python/test/Ice/exceptions/Test/C.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080690972652707182L;
+    private static final long serialVersionUID = 1080691995528609689L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/D.java b/slice2java/python/test/Ice/exceptions/Test/D.java
index 91ed411e59ef..8abfefd19467 100644
--- a/slice2java/python/test/Ice/exceptions/Test/D.java
+++ b/slice2java/python/test/Ice/exceptions/Test/D.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780373651191782318L;
+    private static final long serialVersionUID = 4780374839071989337L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java
index 53c21784ac8b..ab9df7a2acd4 100644
--- a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641410993841552390L;
+    private static final long serialVersionUID = -4641409611857051379L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/A.java b/slice2java/python/test/Ice/objects/Test/A.java
index e2ef532d0891..82f6b9b7f9ad 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 = 6316207198909984898L;
+    private static final long serialVersionUID = 1834217038605840310L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/A1.java b/slice2java/python/test/Ice/objects/Test/A1.java
index 9617f1ad03f8..8252d18bc4a2 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 = -5926736953645302099L;
+    private static final long serialVersionUID = -5926742039443438136L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/B.java b/slice2java/python/test/Ice/objects/Test/B.java
index e67793b0a519..465a36a8d9b0 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 = -8890913782566142201L;
+    private static final long serialVersionUID = -8890919855147494675L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/B1.java b/slice2java/python/test/Ice/objects/Test/B1.java
index 5c8757280747..a52a93a8df9d 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 = 4758520275095674180L;
+    private static final long serialVersionUID = -7596450711758646652L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Base.java b/slice2java/python/test/Ice/objects/Test/Base.java
index cfaed78074c6..51bf9ec0b303 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 = -3194305696987856377L;
+    private static final long serialVersionUID = -7607104252194050621L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/C.java b/slice2java/python/test/Ice/objects/Test/C.java
index a5ce91f1c7e7..f0b0b8d59aba 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 = 167056249213880952L;
+    private static final long serialVersionUID = -4663036280348034439L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/COneMember.java b/slice2java/python/test/Ice/objects/Test/COneMember.java
index 6ff06030beb3..37da308efa51 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 = 3050965552317526037L;
+    private static final long serialVersionUID = 3050964968583073361L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java
index 0952d117b336..74d769727603 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 = 1907231251159799899L;
+    private static final long serialVersionUID = 7091061726409659867L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/D.java b/slice2java/python/test/Ice/objects/Test/D.java
index b7689e07bb49..2d7cd008231f 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 = -1905850966606835775L;
+    private static final long serialVersionUID = -3761611284274159521L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/D1.java b/slice2java/python/test/Ice/objects/Test/D1.java
index c0f13830b066..179a349f9f3d 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 = 2252257525882999939L;
+    private static final long serialVersionUID = -62316992605698621L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/E.java b/slice2java/python/test/Ice/objects/Test/E.java
index b1aade248909..88b0f9fd5e97 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 = -2346049884615219262L;
+    private static final long serialVersionUID = 7687350396584912341L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/EBase.java b/slice2java/python/test/Ice/objects/Test/EBase.java
index f7e83b7037ec..b3890be73c99 100644
--- a/slice2java/python/test/Ice/objects/Test/EBase.java
+++ b/slice2java/python/test/Ice/objects/Test/EBase.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7229215830887194354L;
+    private static final long serialVersionUID = -4152093085886102962L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/EDerived.java b/slice2java/python/test/Ice/objects/Test/EDerived.java
index add5fbb18755..6be4e0c38f67 100644
--- a/slice2java/python/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/python/test/Ice/objects/Test/EDerived.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4239669300507029998L;
+    private static final long serialVersionUID = 806453731505860178L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/EOneMember.java b/slice2java/python/test/Ice/objects/Test/EOneMember.java
index 63af6139e3a7..cf4ced8195fa 100644
--- a/slice2java/python/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/python/test/Ice/objects/Test/EOneMember.java
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225287512325094118L;
+    private static final long serialVersionUID = -6225280150967018658L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java
index 6fe65943a458..7e4d6f31639e 100644
--- a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2915870443825630892L;
+    private static final long serialVersionUID = -6672974633812665516L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/F.java b/slice2java/python/test/Ice/objects/Test/F.java
index 6963680dac76..747379ec0dc3 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 = 948854409896345041L;
+    private static final long serialVersionUID = -8571985727602365231L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/F1.java b/slice2java/python/test/Ice/objects/Test/F1.java
index 354b4cf9169c..670fd5ff6171 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 = 6192369596279730356L;
+    private static final long serialVersionUID = 6192369658270973096L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/F3.java b/slice2java/python/test/Ice/objects/Test/F3.java
index 1f6cda8f8c69..9ce0a7fe6a39 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 = -5124569561420145853L;
+    private static final long serialVersionUID = -2016383515265247353L;
 
     /** @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 2821a05382c5..5259ac389789 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 = -1425250623987938259L;
+    private static final long serialVersionUID = -1425257032184958841L;
 
     /** @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 cb06ca7f76a2..62d88ad9fdaf 100644
--- a/slice2java/python/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/python/test/Ice/objects/Test/Inner/Ex.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337227134742219372L;
+    private static final long serialVersionUID = -2337227839716105999L;
 }
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 c74dc16699e5..c7d5b9d06eb9 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 = -1298691004014926814L;
+    private static final long serialVersionUID = -1298680711118045335L;
 
     /** @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 dab69ef9347d..411e9431856d 100644
--- a/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842229424691765040L;
+    private static final long serialVersionUID = 1842234014418863765L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/K.java b/slice2java/python/test/Ice/objects/Test/K.java
index 65564283f9f6..93d9cd16ec7e 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 = 4645163654728239749L;
+    private static final long serialVersionUID = 4645163114900924215L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/L.java b/slice2java/python/test/Ice/objects/Test/L.java
index 3d95b30572e1..8809df3c4faa 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 = 6629740028290371494L;
+    private static final long serialVersionUID = 6629735195473310339L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/M.java b/slice2java/python/test/Ice/objects/Test/M.java
index 339dd0cac70d..88fa08621e2b 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 = -8088104763635726438L;
+    private static final long serialVersionUID = -8088093318489644949L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Recursive.java b/slice2java/python/test/Ice/objects/Test/Recursive.java
index f5ac39f6bfdc..2797fa15087c 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 = 3617890650155512940L;
+    private static final long serialVersionUID = 3617879199995499037L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/S.java b/slice2java/python/test/Ice/objects/Test/S.java
index efb0a065d7ec..1e2d8a0ae2f2 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 = 481776729362546069L;
+    private static final long serialVersionUID = 481770491583340720L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/SOneMember.java b/slice2java/python/test/Ice/objects/Test/SOneMember.java
index 9cf28c83d64d..ff7b386aa992 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 = 6227748280702284172L;
+    private static final long serialVersionUID = 6227749184738931784L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/STwoMembers.java b/slice2java/python/test/Ice/objects/Test/STwoMembers.java
index 2004b37dcadb..dfc41be702e6 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 = 78046470572553410L;
+    private static final long serialVersionUID = -7831207959637239102L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/StructKey.java b/slice2java/python/test/Ice/objects/Test/StructKey.java
index dd8d9563efc4..1c3d085d88b5 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 = 4319448832248204302L;
+    private static final long serialVersionUID = -7865435122074264935L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java
index a0a2a4b808c0..6e93e338a915 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 = 2723849541153587413L;
+    private static final long serialVersionUID = 2723843401518317028L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/MyClass1.java b/slice2java/python/test/Ice/operations/Test/MyClass1.java
index 02708aa7800e..8d539b5443ca 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 = 5769466273113110948L;
+    private static final long serialVersionUID = -1282498892180206539L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct.java b/slice2java/python/test/Ice/operations/Test/MyStruct.java
index 5c5269194c71..1e94da0a3709 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 = -2071919003602692515L;
+    private static final long serialVersionUID = -9057933063554969667L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct1.java b/slice2java/python/test/Ice/operations/Test/MyStruct1.java
index 67bbf2a2867d..2a064811e913 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 = -279739320295221107L;
+    private static final long serialVersionUID = -5365379452204480996L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/Structure.java b/slice2java/python/test/Ice/operations/Test/Structure.java
index b4a609a00798..f30059ffc068 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 = 7137430408096543738L;
+    private static final long serialVersionUID = 8612049700647472875L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/A.java b/slice2java/python/test/Ice/optional/Test/A.java
index f98bd140d750..70958881b61a 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 = -8727087942150819824L;
+    private static final long serialVersionUID = -6101011232886752496L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/B.java b/slice2java/python/test/Ice/optional/Test/B.java
index 543e17da26c5..fa77ebea8b3f 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 = 7542776939425929571L;
+    private static final long serialVersionUID = -2828684458401572637L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/C.java b/slice2java/python/test/Ice/optional/Test/C.java
index b79e63ee8462..457f69c9806e 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 = -5990391018467948547L;
+    private static final long serialVersionUID = 1921459232617626877L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/DerivedException.java b/slice2java/python/test/Ice/optional/Test/DerivedException.java
index 4efaee06e9c0..9047f2eb8c32 100644
--- a/slice2java/python/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/python/test/Ice/optional/Test/DerivedException.java
@@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9112374472962778459L;
+    private static final long serialVersionUID = -1807032653425430006L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/E.java b/slice2java/python/test/Ice/optional/Test/E.java
index e9f1f513ad9d..13ff40cd32cd 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 = -1850732107767638190L;
+    private static final long serialVersionUID = -1850739372403793593L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/F.java b/slice2java/python/test/Ice/optional/Test/F.java
index 36f6da79ea66..eecb25597906 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 = -6430493720050298591L;
+    private static final long serialVersionUID = -6430492597470057804L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/FixedStruct.java b/slice2java/python/test/Ice/optional/Test/FixedStruct.java
index 107644b01593..d2d8f047a0a5 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 = 1569613965730205073L;
+    private static final long serialVersionUID = 1569601455363502153L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/G.java b/slice2java/python/test/Ice/optional/Test/G.java
index 959194e54af0..f47a80633071 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 = 3818964901812599379L;
+    private static final long serialVersionUID = 3522126195255809363L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/G1.java b/slice2java/python/test/Ice/optional/Test/G1.java
index 4207444855b6..1473651f589f 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 = 7339782921958142507L;
+    private static final long serialVersionUID = 7339784852728470148L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/G2.java b/slice2java/python/test/Ice/optional/Test/G2.java
index 42d1de72eb04..097c0982e698 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 = 3824557823675259601L;
+    private static final long serialVersionUID = 3824551240925522288L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/MultiOptional.java b/slice2java/python/test/Ice/optional/Test/MultiOptional.java
index 2bc5c121048e..06cbce20724c 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 = -280703979070283952L;
+    private static final long serialVersionUID = 6291707550762792758L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/OneOptional.java b/slice2java/python/test/Ice/optional/Test/OneOptional.java
index af210bf34188..d89ee9730d69 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 = -7219609119157417921L;
+    private static final long serialVersionUID = -7219599297474248345L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/OptionalException.java b/slice2java/python/test/Ice/optional/Test/OptionalException.java
index 4624e5453775..6f402df564aa 100644
--- a/slice2java/python/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/python/test/Ice/optional/Test/OptionalException.java
@@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 340942337544824717L;
+    private static final long serialVersionUID = 1580400024233223716L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java
index d81b70df5d81..abfa00d0b8f5 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 = -359867022917287749L;
+    private static final long serialVersionUID = -5438044205811046981L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/RequiredException.java b/slice2java/python/test/Ice/optional/Test/RequiredException.java
index 5177b3821f8a..0280a677428b 100644
--- a/slice2java/python/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/python/test/Ice/optional/Test/RequiredException.java
@@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894245724817597474L;
+    private static final long serialVersionUID = 2894238795959335885L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/SmallStruct.java b/slice2java/python/test/Ice/optional/Test/SmallStruct.java
index a7184a94e364..97eb4c9f6435 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 = 6700991632018129762L;
+    private static final long serialVersionUID = 6700987981264296427L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/VarStruct.java b/slice2java/python/test/Ice/optional/Test/VarStruct.java
index 6c58ca2a5f98..08e036ef0f2d 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 = -1912285263730948701L;
+    private static final long serialVersionUID = -1912284014855117300L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/WD.java b/slice2java/python/test/Ice/optional/Test/WD.java
index 4291ef3be2cb..dafce16993cc 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 = -3660668127562345804L;
+    private static final long serialVersionUID = 1647936985967497347L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/C1.java b/slice2java/python/test/Ice/packagemd/Test1/C1.java
index ed3c1b846558..5ca6b0b06b0a 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 = 1894608107990385344L;
+    private static final long serialVersionUID = 1894594658651877788L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/C2.java b/slice2java/python/test/Ice/packagemd/Test1/C2.java
index 6a1bba07e95c..094db8262bc2 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 = 2892575372402073324L;
+    private static final long serialVersionUID = 2892578242103291226L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/E1.java b/slice2java/python/test/Ice/packagemd/Test1/E1.java
index 340b231869fa..52c494391d73 100644
--- a/slice2java/python/test/Ice/packagemd/Test1/E1.java
+++ b/slice2java/python/test/Ice/packagemd/Test1/E1.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5787339943594554703L;
+    private static final long serialVersionUID = 5787342609169871251L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test1/E2.java b/slice2java/python/test/Ice/packagemd/Test1/E2.java
index ec1c66ad2fe5..51d78481963b 100644
--- a/slice2java/python/test/Ice/packagemd/Test1/E2.java
+++ b/slice2java/python/test/Ice/packagemd/Test1/E2.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4908755249077525686L;
+    private static final long serialVersionUID = 4908752624914143872L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test1/def.java b/slice2java/python/test/Ice/packagemd/Test1/def.java
index a3631170b11d..0950c2c32001 100644
--- a/slice2java/python/test/Ice/packagemd/Test1/def.java
+++ b/slice2java/python/test/Ice/packagemd/Test1/def.java
@@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7298382899859155356L;
+    private static final long serialVersionUID = 7298391144728873920L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test2/C1.java b/slice2java/python/test/Ice/packagemd/Test2/C1.java
index 7f758c4db318..7d02f6921bbe 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 = -860912582450560533L;
+    private static final long serialVersionUID = -860911889005649012L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test2/C2.java b/slice2java/python/test/Ice/packagemd/Test2/C2.java
index 9ad6b34fa0d9..f8fb97c684b0 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 = 954149230005067432L;
+    private static final long serialVersionUID = 954151576680849167L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test2/E1.java b/slice2java/python/test/Ice/packagemd/Test2/E1.java
index f08d7ecfacb4..e63bc68b5a14 100644
--- a/slice2java/python/test/Ice/packagemd/Test2/E1.java
+++ b/slice2java/python/test/Ice/packagemd/Test2/E1.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6934983811340405444L;
+    private static final long serialVersionUID = 6934987085285373219L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test2/E2.java b/slice2java/python/test/Ice/packagemd/Test2/E2.java
index 3917221c4cff..cdfd6f1f5b22 100644
--- a/slice2java/python/test/Ice/packagemd/Test2/E2.java
+++ b/slice2java/python/test/Ice/packagemd/Test2/E2.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5414542343262689009L;
+    private static final long serialVersionUID = 5414540477317153686L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test3/C1.java b/slice2java/python/test/Ice/packagemd/Test3/C1.java
index a72c15285a21..71f5563ff04c 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 = 5832355945853529066L;
+    private static final long serialVersionUID = 5832348624443481421L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test3/C2.java b/slice2java/python/test/Ice/packagemd/Test3/C2.java
index a8f32571b644..cd966547d786 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 = 2769372115474369288L;
+    private static final long serialVersionUID = 2769379751699077615L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test3/E1.java b/slice2java/python/test/Ice/packagemd/Test3/E1.java
index e4fa90552120..8829b60a4a66 100644
--- a/slice2java/python/test/Ice/packagemd/Test3/E1.java
+++ b/slice2java/python/test/Ice/packagemd/Test3/E1.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5344581528273715813L;
+    private static final long serialVersionUID = 5344587361761143938L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test3/E2.java b/slice2java/python/test/Ice/packagemd/Test3/E2.java
index 65291b5713f0..627867eba805 100644
--- a/slice2java/python/test/Ice/packagemd/Test3/E2.java
+++ b/slice2java/python/test/Ice/packagemd/Test3/E2.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8399044872166402352L;
+    private static final long serialVersionUID = -8399044178569621065L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/C.java b/slice2java/python/test/Ice/scope/Test/C.java
index 7d904f203124..a148bd10cc72 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 = -5190248369144235091L;
+    private static final long serialVersionUID = -5190248330257788974L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/C1.java b/slice2java/python/test/Ice/scope/Test/C1.java
index b1c7ef619c1d..7a078ed41309 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 = 8893234793148708177L;
+    private static final long serialVersionUID = 8893234919693712916L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/C2.java b/slice2java/python/test/Ice/scope/Test/C2.java
index b64c32564e88..8209069cf89b 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 = -2752639006377387269L;
+    private static final long serialVersionUID = 4014838133305489109L;
 
     /** @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 fafb10729e02..248f62dc53cf 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 = 4615626744047341411L;
+    private static final long serialVersionUID = 4615626622709151055L;
 
     /** @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 f028f4e8cbe5..f788c4669f65 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 = 672593434937594246L;
+    private static final long serialVersionUID = 672593313436926802L;
 
     /** @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 4b31a05d117b..619a2ddd0241 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 = 8654437676099269074L;
+    private static final long serialVersionUID = 8654437715013737164L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/Inner/S.java b/slice2java/python/test/Ice/scope/Test/Inner/S.java
index abf068c3229a..828a740a609e 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 = 3694620504991365534L;
+    private static final long serialVersionUID = 3694620543877808128L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S.java b/slice2java/python/test/Ice/scope/Test/S.java
index d2e3292a23e5..3f1232f74448 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 = 2159701024955328352L;
+    private static final long serialVersionUID = 2159700903415005438L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S1.java b/slice2java/python/test/Ice/scope/Test/S1.java
index 23c0946ca7d3..cfad60bf72d2 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 = 1241678602181723112L;
+    private static final long serialVersionUID = 1241678480632104749L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S2.java b/slice2java/python/test/Ice/scope/Test/S2.java
index d905691f3132..9171a5a5179e 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 = -7332310727081012094L;
+    private static final long serialVersionUID = 5209261030960676908L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java
index e497fae56f61..512ba3b9b07b 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477023901472768430L;
+    private static final long serialVersionUID = -477020929871625605L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 711e0a23bd71..36a2c4887177 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485214484111142772L;
+    private static final long serialVersionUID = 3485211515106259741L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 46cb6cca17fc..1908764b0194 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717378179694168325L;
+    private static final long serialVersionUID = 1717375208111859948L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 48c4e00ed7a5..e8bc6fdad875 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384918335757345188L;
+    private static final long serialVersionUID = -7384921299776610827L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index ae7b99dd1611..c2ae8887449d 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424380613467757546L;
+    private static final long serialVersionUID = 3424372060002004489L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 30a0aa559891..7be4f4fa80ea 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172597840315318149L;
+    private static final long serialVersionUID = -1172606143241024424L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 31bc2fdb1409..ff6cb02ee7f2 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126108948932520574L;
+    private static final long serialVersionUID = -1126117171630954335L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index 9eadebb3ce88..325d61ef9a86 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097573123949935134L;
+    private static final long serialVersionUID = -2097581677415688191L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/B.java b/slice2java/python/test/Ice/slicing/objects/Test/B.java
index edbcce99c719..08f9f4667e2e 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 = 5244450600314576852L;
+    private static final long serialVersionUID = 3935567318228400978L;
 
     /** @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 d1e5a084f289..da4dafa8ece7 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java
@@ -78,5 +78,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6376008655111235096L;
+    private static final long serialVersionUID = 8523011923905480094L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 902893f77c7c..c83f3a905f11 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 = -6396997343640216373L;
+    private static final long serialVersionUID = -6397006085632211247L;
 
     /** @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 b1b5bb02b68d..964388d7c2e8 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 = -9066888242573358817L;
+    private static final long serialVersionUID = -9066880535283548300L;
 
     /** @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 1d8ae725d90e..2c357cb04cb4 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 = -7398528405781221833L;
+    private static final long serialVersionUID = 2552324914645922417L;
 
     /** @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 c1fa176cc62b..3403fc2cca59 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 = -2597393438065729497L;
+    private static final long serialVersionUID = -295236416614157538L;
 
     /** @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 577d29fd9a74..3d6869e2f0f5 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 = 342763249573392134L;
+    private static final long serialVersionUID = -2934242496241114138L;
 
     /** @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 03f86d3b1e29..15880be0e6d5 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 = 2118870231094931059L;
+    private static final long serialVersionUID = -8837775289080183757L;
 
     /** @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 2697688b5a71..58060f10be94 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9050622558332299035L;
+    private static final long serialVersionUID = 1245071335710061584L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java
index acac62117f0d..34f149e3507e 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 = -7655927238043008864L;
+    private static final long serialVersionUID = -7655923699523828043L;
 
     /** @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 a36facd31043..cc93d55881e2 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 = -2271124621972167728L;
+    private static final long serialVersionUID = -2271128160322297111L;
 
     /** @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 edb09e3b9249..fba2e302b127 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 = 4147524380783565879L;
+    private static final long serialVersionUID = 4147532663057549756L;
 
     /** @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 48ae04b94617..a35675d0b881 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 = 481713006014666639L;
+    private static final long serialVersionUID = 481713891911897756L;
 
     /** @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 728d0494e62b..505e5e8f45c3 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 = -4426882535779171957L;
+    private static final long serialVersionUID = -4426891112463266799L;
 
     /** @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 64bbae518151..80a224d213bc 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 = 850540217951130966L;
+    private static final long serialVersionUID = 850542823084167872L;
 
     /** @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 8b1846021190..8d3bbe694edc 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 = -4328907911803423250L;
+    private static final long serialVersionUID = -4328900050834370572L;
 
     /** @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 a7490bba06d0..f3172567221b 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 = -5081806727747880810L;
+    private static final long serialVersionUID = -5081814506038206358L;
 
     /** @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 1f2e94e2c491..55d05179171e 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 = 643086422013213336L;
+    private static final long serialVersionUID = 643085531160153907L;
 
     /** @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 24f2a4a74f72..4cc747b5a812 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 = -2438000678750633471L;
+    private static final long serialVersionUID = -2438013836257858685L;
 
     /** @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 128fda01a783..9398c65ba9d0 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 = -4258911888941674599L;
+    private static final long serialVersionUID = 4961991742167148669L;
 
     /** @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 4ad5060e09c1..df9c9ca711d1 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 = -8813708385758096660L;
+    private static final long serialVersionUID = -8813705592360606419L;
 
     /** @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 663701d1dad7..35de81b00e24 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 = 3651532811432055767L;
+    private static final long serialVersionUID = 3651529272962632389L;
 
     /** @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 76e4db6c7196..2c0966f8cbc9 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 = 8804372305641253234L;
+    private static final long serialVersionUID = 8804382324992948192L;
 
     /** @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 8649e61c2c28..3cd9c1fd7b89 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 = -4989057312163784666L;
+    private static final long serialVersionUID = -4989065594418745703L;
 
     /** @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 092b01524105..9f555697f3a5 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 = -5353754364538137468L;
+    private static final long serialVersionUID = -5353761736399037290L;
 
     /** @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 2f8ed0f582ef..36607e655312 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 = -6522141831187736366L;
+    private static final long serialVersionUID = -6522139909431051992L;
 
     /** @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 19d99440c2b5..1472de180ece 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 = 7620283112762175953L;
+    private static final long serialVersionUID = 7620288007480435819L;
 
     /** @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 a13cce774197..d6d42c588043 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 = 5953135339381686616L;
+    private static final long serialVersionUID = -6774438401459926442L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java
index df2534f8b4e2..800f9601f8ba 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 = -2352072095324919499L;
+    private static final long serialVersionUID = -3261551631158290620L;
 
     /** @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 f7ebda4e11fa..422c0978f01f 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6368243844991857167L;
+    private static final long serialVersionUID = 5316443419546246997L;
 }
diff --git a/slice2java/python/test/Slice/escape/Clash/Cls.java b/slice2java/python/test/Slice/escape/Clash/Cls.java
index 346656459f7f..bef29940b0ad 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 = -1187752356413365647L;
+    private static final long serialVersionUID = 6892778332323925077L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/escape/Clash/Ex.java b/slice2java/python/test/Slice/escape/Clash/Ex.java
index 8a3232cabfa6..b7bd10e754cd 100644
--- a/slice2java/python/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/python/test/Slice/escape/Clash/Ex.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -585266864719664666L;
+    private static final long serialVersionUID = 3128434486582384738L;
 }
diff --git a/slice2java/python/test/Slice/escape/Clash/St.java b/slice2java/python/test/Slice/escape/Clash/St.java
index d432b8807bac..13dc82048244 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 = -7072474600574882496L;
+    private static final long serialVersionUID = -3600606900736631775L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/_continue.java b/slice2java/python/test/Slice/escape/and/_continue.java
index e7c0d156d74a..dadc12e95f67 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 = 1201381968049638747L;
+    private static final long serialVersionUID = 1201381754720585833L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/_for.java b/slice2java/python/test/Slice/escape/and/_for.java
index 56ee46ad1ede..4d7ade75121b 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 = 5001789998953909053L;
+    private static final long serialVersionUID = -5347127330756223419L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/escape/and/is.java b/slice2java/python/test/Slice/escape/and/is.java
index db6b210c65c3..3870e2e5223d 100644
--- a/slice2java/python/test/Slice/escape/and/is.java
+++ b/slice2java/python/test/Slice/escape/and/is.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4585935484860078432L;
+    private static final long serialVersionUID = -4585935597133169902L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/not.java b/slice2java/python/test/Slice/escape/and/not.java
index d96cebaea7c3..ef4a8beefa88 100644
--- a/slice2java/python/test/Slice/escape/and/not.java
+++ b/slice2java/python/test/Slice/escape/and/not.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8379174143796500729L;
+    private static final long serialVersionUID = -3533571455297157703L;
 }
diff --git a/slice2java/python/test/Slice/macros/Test/Default.java b/slice2java/python/test/Slice/macros/Test/Default.java
index 743e8dc2cf78..ac69b5f70a13 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 = -1947335301952595906L;
+    private static final long serialVersionUID = 5000836385924706494L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/macros/Test/NoDefault.java b/slice2java/python/test/Slice/macros/Test/NoDefault.java
index 4fb3d533b008..6a83dc30f7ea 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 = -609788800738342177L;
+    private static final long serialVersionUID = -4538994219149535009L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/structure/Test/C.java b/slice2java/python/test/Slice/structure/Test/C.java
index db1fa36fc7f3..db514a48f3bc 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 = 1667159039753600127L;
+    private static final long serialVersionUID = 1667152486821268179L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/structure/Test/S1.java b/slice2java/python/test/Slice/structure/Test/S1.java
index c4bf56e8813b..01ea3fd4e842 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 = -5542853695221184681L;
+    private static final long serialVersionUID = -5542866555635920453L;
 }
diff --git a/slice2java/python/test/Slice/structure/Test/S2.java b/slice2java/python/test/Slice/structure/Test/S2.java
index 29f623474311..b27da3395f83 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 = 795853345474697463L;
+    private static final long serialVersionUID = -8812905433742213769L;
 }
diff --git a/slice2java/python/test/Slice/structure/Test/S3.java b/slice2java/python/test/Slice/structure/Test/S3.java
index a5da22ac740b..20e31952c948 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 = -5365878178326197558L;
+    private static final long serialVersionUID = -3470387418585579866L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java
index 520f9efdd13e..a0456059aca5 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 = 6731233979137681175L;
+    private static final long serialVersionUID = 2226074532513040526L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java
index ef0599bc41cf..1d13ff51ba1a 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 = 3941437095089354451L;
+    private static final long serialVersionUID = -8400170359284275790L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 13489ddddc9a..3d2580208922 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 = 7710771634636176827L;
+    private static final long serialVersionUID = -7507450770109063337L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java
index 4691e757e42d..37fcb9c5bdd6 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 = -7509378993566768135L;
+    private static final long serialVersionUID = -8419641075709534026L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java
index 8049d30a4124..30835439dddb 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 = 5127385410096664854L;
+    private static final long serialVersionUID = 5127394733195028432L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java
index 6c7319cb1c3f..3cb6c9934542 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 = 5864103948810483694L;
+    private static final long serialVersionUID = -3155231066229190600L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java
index fb8300cf7a56..b96b53a4cf96 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 = 3900820241535506793L;
+    private static final long serialVersionUID = 1783469029056000821L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java
index 1a22cb88b925..24027178983c 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 = -7119341022297024024L;
+    private static final long serialVersionUID = -6719759278444522700L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/A.java b/slice2java/ruby/test/Ice/exceptions/Test/A.java
index bf4cf824e69b..8df3774774b0 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/A.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/A.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823745223977886477L;
+    private static final long serialVersionUID = 7823745192859474576L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/B.java b/slice2java/ruby/test/Ice/exceptions/Test/B.java
index 1c49e6a3146d..28969a31f503 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/B.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/B.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861410674382331059L;
+    private static final long serialVersionUID = -3861410870808642992L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/C.java b/slice2java/ruby/test/Ice/exceptions/Test/C.java
index a6c600dcdd13..b162beb219fd 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/C.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/C.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080698915180671757L;
+    private static final long serialVersionUID = 1080698884062259856L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/D.java b/slice2java/ruby/test/Ice/exceptions/Test/D.java
index 009b9ad1bdff..a4dbd0e94467 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/D.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/D.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780381593719747149L;
+    private static final long serialVersionUID = 4780381397293435216L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java
index 8ce59c45b3d1..c96df5ee171b 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641413641350924903L;
+    private static final long serialVersionUID = -4641413953928868348L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/A.java b/slice2java/ruby/test/Ice/objects/Test/A.java
index d05a70987da5..07f0562ecac3 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 = 1091551636522284662L;
+    private static final long serialVersionUID = 938118911302224502L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/A1.java b/slice2java/ruby/test/Ice/objects/Test/A1.java
index 1466a24cf9e3..c0b90afe7265 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 = -5926739146553255751L;
+    private static final long serialVersionUID = -5926752080526624678L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/B.java b/slice2java/ruby/test/Ice/objects/Test/B.java
index 59630283afeb..93c22d13cdf1 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 = -8890911507160766212L;
+    private static final long serialVersionUID = -8890917834131271329L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/B1.java b/slice2java/ruby/test/Ice/objects/Test/B1.java
index aaeaa34499f9..3c2e6931cc41 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 = 8185951627013732996L;
+    private static final long serialVersionUID = -6453308009095652092L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/Base.java b/slice2java/ruby/test/Ice/objects/Test/Base.java
index 2525792b51ab..43022601732d 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 = 3399303336105576270L;
+    private static final long serialVersionUID = 1232020250125252718L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/C.java b/slice2java/ruby/test/Ice/objects/Test/C.java
index 47dcbb58aa72..d0debf645f72 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 = -2874813302507569302L;
+    private static final long serialVersionUID = 7200670407037512169L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/COneMember.java b/slice2java/ruby/test/Ice/objects/Test/COneMember.java
index b08feeab9feb..b4aa0daeb06b 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 = 3050966893029344829L;
+    private static final long serialVersionUID = 3050973372397629411L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java
index 54907607c66d..e47b8e5e5cb4 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 = -367102463928862821L;
+    private static final long serialVersionUID = 2912657866446125595L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/D.java b/slice2java/ruby/test/Ice/objects/Test/D.java
index 30f6d2703624..061afe33413c 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 = 2712918153234406254L;
+    private static final long serialVersionUID = 8478605697394929453L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/D1.java b/slice2java/ruby/test/Ice/objects/Test/D1.java
index c820a18f7caf..40ecf41afc27 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 = 1092311622830843459L;
+    private static final long serialVersionUID = 2140239010240689475L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/E.java b/slice2java/ruby/test/Ice/objects/Test/E.java
index 14b22bce372f..23835a7197bb 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 = -6051326918445609160L;
+    private static final long serialVersionUID = 4306853869884232280L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/EBase.java b/slice2java/ruby/test/Ice/objects/Test/EBase.java
index ec7d7efab5ef..cdb32cfed3f5 100644
--- a/slice2java/ruby/test/Ice/objects/Test/EBase.java
+++ b/slice2java/ruby/test/Ice/objects/Test/EBase.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2180437562264714162L;
+    private static final long serialVersionUID = -3919325349737438770L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/EDerived.java b/slice2java/ruby/test/Ice/objects/Test/EDerived.java
index f56ab35e1b55..deec76eb4f8d 100644
--- a/slice2java/ruby/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/ruby/test/Ice/objects/Test/EDerived.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9020201982627774766L;
+    private static final long serialVersionUID = 3387341459417706578L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java
index c165711a99b5..11e87b6f0912 100644
--- a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225277903819845774L;
+    private static final long serialVersionUID = -6225288185118066004L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java
index b8e3244f4fd0..b9320f648106 100644
--- a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4473866662979242988L;
+    private static final long serialVersionUID = 948126786085953684L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/F.java b/slice2java/ruby/test/Ice/objects/Test/F.java
index 282d267ddda8..4f4e4e14f6c5 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 = -641546380467580207L;
+    private static final long serialVersionUID = 1385852784966790737L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/F1.java b/slice2java/ruby/test/Ice/objects/Test/F1.java
index 3df99d0f7422..1ab442636839 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 = 6192372363817410726L;
+    private static final long serialVersionUID = 6192365966058373535L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/F3.java b/slice2java/ruby/test/Ice/objects/Test/F3.java
index b79678af16b4..d25ef73d177e 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 = -7670839978498952964L;
+    private static final long serialVersionUID = 7477717543487318140L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/K.java b/slice2java/ruby/test/Ice/objects/Test/K.java
index 3f5438f8433d..8935ad73c428 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 = 4645160552629563294L;
+    private static final long serialVersionUID = 4645167866217130237L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/L.java b/slice2java/ruby/test/Ice/objects/Test/L.java
index 0158faf56a48..83ac119e5fdb 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 = 6629743543509908402L;
+    private static final long serialVersionUID = 6629744244850612369L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/M.java b/slice2java/ruby/test/Ice/objects/Test/M.java
index 204483bd0660..97f938dea974 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 = -8088101666545449511L;
+    private static final long serialVersionUID = -8088098069807223494L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/Recursive.java b/slice2java/ruby/test/Ice/objects/Test/Recursive.java
index 6e0b05d00f14..d9728c19ba1e 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 = 3617887548041915515L;
+    private static final long serialVersionUID = 3617883951308570136L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/S.java b/slice2java/ruby/test/Ice/objects/Test/S.java
index d4113b75688f..5d6199647853 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 = 481773384455787649L;
+    private static final long serialVersionUID = 481772517807183650L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java
index f6e38e0a36b6..b8fdb412b142 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 = 6227746939999247204L;
+    private static final long serialVersionUID = 6227757637316392378L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java
index 9e26b62f56eb..dc8798e4434c 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 = -2538690549459085950L;
+    private static final long serialVersionUID = 5956192556941104642L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/StructKey.java b/slice2java/ruby/test/Ice/objects/Test/StructKey.java
index c7c24f1f5143..4db567164cfd 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 = 4193455314507547892L;
+    private static final long serialVersionUID = 4349923706964125972L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java
index 21f9d4efe4cf..99dcc5c2f961 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 = 2723844430901096896L;
+    private static final long serialVersionUID = 2723851202150601027L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java
index 0376d96011c4..23d8a16e5916 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 = -655471663616460455L;
+    private static final long serialVersionUID = 6138395949487816890L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java
index 8e65e3ddcc53..ff9c08447799 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 = -7067216034010974691L;
+    private static final long serialVersionUID = 77735685062034173L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java
index a3f2c07eed5b..5b562caea892 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 = -4473301886736304400L;
+    private static final long serialVersionUID = -5008375896590807021L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/Structure.java b/slice2java/ruby/test/Ice/operations/Test/Structure.java
index 9d03916598bb..29640305f115 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 = 6617206178427889036L;
+    private static final long serialVersionUID = 1143777330836894255L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/A.java b/slice2java/ruby/test/Ice/optional/Test/A.java
index c8350cb1af3b..c299afce3de5 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 = -768167412274229872L;
+    private static final long serialVersionUID = -1679938669849517296L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/B.java b/slice2java/ruby/test/Ice/optional/Test/B.java
index 06299a98dd7c..57f7a1ed03b0 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 = -9148925164712043933L;
+    private static final long serialVersionUID = -3139134010359650077L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/C.java b/slice2java/ruby/test/Ice/optional/Test/C.java
index 93e402fb4764..c78e459d5749 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 = -472452136023034755L;
+    private static final long serialVersionUID = 2109048070773385661L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java
index 4057177500ea..74c85112b7f1 100644
--- a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java
@@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5244302446893592878L;
+    private static final long serialVersionUID = -6901256720247609490L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/E.java b/slice2java/ruby/test/Ice/optional/Test/E.java
index 1c0ce3b40682..2bd95c08424e 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 = -1850739371252659803L;
+    private static final long serialVersionUID = -1850740811113329245L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/F.java b/slice2java/ruby/test/Ice/optional/Test/F.java
index 63386a3e6659..f2a5feb38e19 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 = -6430492593630256810L;
+    private static final long serialVersionUID = -6430496929219502256L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java
index a34d948f91fb..5ed2e9ed67de 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 = 1569601451578566641L;
+    private static final long serialVersionUID = 1569605301354830509L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/G.java b/slice2java/ruby/test/Ice/optional/Test/G.java
index 9f12aada2449..b32f2de8a490 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 = 7400623225325465299L;
+    private static final long serialVersionUID = 4544559655720298067L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/G1.java b/slice2java/ruby/test/Ice/optional/Test/G1.java
index be62ace81796..376c306456a1 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 = 7339784856461064156L;
+    private static final long serialVersionUID = 7339780520978881952L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/G2.java b/slice2java/ruby/test/Ice/optional/Test/G2.java
index f2216b2d544f..5151f6cf03fe 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 = 3824551242088947118L;
+    private static final long serialVersionUID = 3824549802229917268L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java
index e9653534c622..a31f25e6a5f8 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 = -8620635970071608198L;
+    private static final long serialVersionUID = -3926019535757221801L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java
index 6d45be24bcb1..94a3b1ef3efc 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 = -7219599296268659425L;
+    private static final long serialVersionUID = -7219600415880626365L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java
index da8de3ae6590..7f0479529230 100644
--- a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java
@@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 528146167681227053L;
+    private static final long serialVersionUID = -7646567336074410816L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java
index 63ee7481f61b..e1b13536cc59 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 = 3749677437502754235L;
+    private static final long serialVersionUID = -2597627264666415557L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java
index 2a22eed362ce..adcf79a9efb2 100644
--- a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java
@@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894238792253259157L;
+    private static final long serialVersionUID = 2894242641946073001L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java
index 0c09529985bb..a58a8da323b5 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 = 6700987985043743901L;
+    private static final long serialVersionUID = 6700983649519438735L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java
index 77148f9f7e19..2892f8ac1af4 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 = -1912284011123097260L;
+    private static final long serialVersionUID = -1912288346604705496L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/WD.java b/slice2java/ruby/test/Ice/optional/Test/WD.java
index 03400d93021b..0c42e19d152b 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 = 7975529688815423075L;
+    private static final long serialVersionUID = 2248697187277621443L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C.java b/slice2java/ruby/test/Ice/scope/Test/C.java
index f3e32304e6c8..3f66335e0b9e 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 = -5190250053068898348L;
+    private static final long serialVersionUID = -5190251422020341130L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C1.java b/slice2java/ruby/test/Ice/scope/Test/C1.java
index 929933603b47..69eeb75236bc 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 = 8893230340169330664L;
+    private static final long serialVersionUID = 8893231869111151818L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C2.java b/slice2java/ruby/test/Ice/scope/Test/C2.java
index 69a833ab64db..967e27207c63 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 = 6277136658746019970L;
+    private static final long serialVersionUID = -4077825734150219360L;
 
     /** @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 a420d26e1e61..99fe60470ef7 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 = 4615625703008007386L;
+    private static final long serialVersionUID = 4615629634383415544L;
 
     /** @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 2b747f383dbc..5b0e52c08e74 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 = 672580636374373567L;
+    private static final long serialVersionUID = 672584898062125533L;
 
     /** @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 c70877180312..78f9af9a0e12 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 = 8654442294538327979L;
+    private static final long serialVersionUID = 8654440765444709065L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java
index 3edd3e3ce6c4..1c26d97bce23 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 = 3694613365905757159L;
+    private static final long serialVersionUID = 3694611836812416773L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S.java b/slice2java/ruby/test/Ice/scope/Test/S.java
index 6fcfab8e0ff5..f8f2e47ed21b 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 = 2159705439038778585L;
+    private static final long serialVersionUID = 2159709530404708731L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S1.java b/slice2java/ruby/test/Ice/scope/Test/S1.java
index 24dfebdf2e50..2f21c169f1db 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 = 1241671979531798481L;
+    private static final long serialVersionUID = 1241676401513528691L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S2.java b/slice2java/ruby/test/Ice/scope/Test/S2.java
index 216261aaed7c..9c2fb89db2a1 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 = 5018192259898031611L;
+    private static final long serialVersionUID = 5729648674994544473L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java
index b32031be773c..1e45fd83c6cd 100644
--- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477020025841085287L;
+    private static final long serialVersionUID = -477020143443282623L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java
index eaafcd37506f..19138f276b87 100644
--- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485212739435091775L;
+    private static final long serialVersionUID = 3485212792448841831L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 08e7ded63904..b2d8b17401c7 100644
--- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717373622205345998L;
+    private static final long serialVersionUID = 1717373594991784214L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 8330c200a5e9..4e915b42e182 100644
--- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384913938410829801L;
+    private static final long serialVersionUID = -7384914071500716465L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java
index 27cfb71396fc..61a9a92942bd 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 = 5120326963637958217L;
+    private static final long serialVersionUID = -2109158452600253536L;
 
     /** @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 0b267bce0020..8685c3699574 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java
@@ -78,5 +78,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7663992261566635259L;
+    private static final long serialVersionUID = -7248525826151664020L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java
index c5f13975d85e..d48fe7c4cde0 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 = -6396993798487222876L;
+    private static final long serialVersionUID = -6396993507985114411L;
 
     /** @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 608686d19750..8828bf689462 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 = -9066881013087320391L;
+    private static final long serialVersionUID = -9066886199356447284L;
 
     /** @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 1326c163411f..d3af21f45623 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 = 1847305115251170826L;
+    private static final long serialVersionUID = -1986750173241768765L;
 
     /** @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 a3fafe144818..80a325e45e4a 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 = -1278473397152298298L;
+    private static final long serialVersionUID = 5071479917412626416L;
 
     /** @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 36541f1f627f..285f987d0f54 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 738688353662884764L;
+    private static final long serialVersionUID = 2130433398920355160L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java
index 9c5ec4f738b4..98085056e60e 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 = -7655922901447174656L;
+    private static final long serialVersionUID = -7655929446401004140L;
 
     /** @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 17198ff00f35..49b77e0f5658 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 = -2271128958725839092L;
+    private static final long serialVersionUID = -2271122744066389077L;
 
     /** @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 920d59e280c1..c79d59dfaffe 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 = 481708669260977513L;
+    private static final long serialVersionUID = 481719308171846236L;
 
     /** @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 e62c895bdb78..6a02b55c67a1 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 = -4426878660313973916L;
+    private static final long serialVersionUID = -4426878700123930603L;
 
     /** @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 c2f33c7b3182..223e6cb46746 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 = 850535660439326837L;
+    private static final long serialVersionUID = 850535700553145596L;
 
     /** @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 5af6054e476c..096672a582b2 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 = -4328907008998262253L;
+    private static final long serialVersionUID = -4328906969187855807L;
 
     /** @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 5012c40eacef..b5c6138a4d24 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 = -5081810272751071393L;
+    private static final long serialVersionUID = -5081810232635553476L;
 
     /** @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 66bfb8ad6af0..848dcf85fabe 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 = 643079523133496446L;
+    private static final long serialVersionUID = 643091195542486859L;
 
     /** @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 ff391e846bc6..c3179a2ff723 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 = -2438007903227193501L;
+    private static final long serialVersionUID = -2438008342492689147L;
 
     /** @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 a266fdb6e540..a0d2dbd8efca 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 = 3651528474687278248L;
+    private static final long serialVersionUID = 3651534689227187075L;
 
     /** @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 505c6fd00a93..f812ae765b9a 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 = 8804376637381418765L;
+    private static final long serialVersionUID = 8804377079045488550L;
 
     /** @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 de6956b40b47..bda61e7dc917 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 = -5353761258550739397L;
+    private static final long serialVersionUID = -5353756573110057904L;
 
     /** @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 ba5a06b60a52..ffff0ff0377c 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 = -6522134932014193932L;
+    private static final long serialVersionUID = -6522145243027104484L;
 
     /** @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 d59ff8e7f427..5ffddcb0a44e 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 = 7620287444497687607L;
+    private static final long serialVersionUID = 7620282761545289631L;
 
     /** @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 f6a0eaff637d..841fddfe7bdc 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 = 713284936583990440L;
+    private static final long serialVersionUID = -6420660932566742241L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/and.java b/slice2java/ruby/test/Slice/escape/BEGIN/and.java
index e3c04edc874f..7633e1064f80 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 = 1440109137765991849L;
+    private static final long serialVersionUID = 1440101676865425254L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/display.java b/slice2java/ruby/test/Slice/escape/BEGIN/display.java
index d1086b8591a6..b1257dfd7de1 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 = 6580503430805974198L;
+    private static final long serialVersionUID = -8040284032745324808L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/next.java b/slice2java/ruby/test/Slice/escape/BEGIN/next.java
index 38601929fc3b..a691f469b26f 100644
--- a/slice2java/ruby/test/Slice/escape/BEGIN/next.java
+++ b/slice2java/ruby/test/Slice/escape/BEGIN/next.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3375550935263777918L;
+    private static final long serialVersionUID = 3375552940984669745L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java
index c808e380cf4f..6c21825295e3 100644
--- a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java
+++ b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2035425930498901521L;
+    private static final long serialVersionUID = 7720298253267985135L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/Clash/Cls.java b/slice2java/ruby/test/Slice/escape/Clash/Cls.java
index fa32e3e3a682..4368e48243b9 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 = 8426188650634433999L;
+    private static final long serialVersionUID = -3080439809445552645L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/escape/Clash/Ex.java b/slice2java/ruby/test/Slice/escape/Clash/Ex.java
index 5bc3081ae6b0..115ec944a314 100644
--- a/slice2java/ruby/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/ruby/test/Slice/escape/Clash/Ex.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9189556058323223303L;
+    private static final long serialVersionUID = 679500147420769599L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/Clash/St.java b/slice2java/ruby/test/Slice/escape/Clash/St.java
index f951aa834568..1d1204cfeb96 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 = -5042735156212829561L;
+    private static final long serialVersionUID = 7238027462056749981L;
 }
diff --git a/slice2java/ruby/test/Slice/macros/Test/Default.java b/slice2java/ruby/test/Slice/macros/Test/Default.java
index 1b9f9a64ec69..52e20b21b94d 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 = -2734146377713375362L;
+    private static final long serialVersionUID = 5470059747560891070L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java
index 583acdb5ab51..1835f3e76f9e 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 = 1045648589774090399L;
+    private static final long serialVersionUID = -8604445158843914913L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/structure/Test/C.java b/slice2java/ruby/test/Slice/structure/Test/C.java
index 81c3776f8b21..28a7834e9b59 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 = -3172283272756922731L;
+    private static final long serialVersionUID = -3172282971923224772L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/structure/Test/S1.java b/slice2java/ruby/test/Slice/structure/Test/S1.java
index ecff750e156b..ba15b2e441be 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 = -5542854183531586751L;
+    private static final long serialVersionUID = -5542853551930221272L;
 }
diff --git a/slice2java/ruby/test/Slice/structure/Test/S2.java b/slice2java/ruby/test/Slice/structure/Test/S2.java
index c05c8c603006..5386ab772b8d 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 = 8131081005599113169L;
+    private static final long serialVersionUID = -7572518812231721224L;
 }
diff --git a/slice2java/scripts/Test/Common/Config.java b/slice2java/scripts/Test/Common/Config.java
index c8fbe9ccde31..2dfd4f063321 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 = 4576036403514286453L;
+    private static final long serialVersionUID = -3150834849448277583L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/scripts/Test/Common/OptionOverrides.java b/slice2java/scripts/Test/Common/OptionOverrides.java
index 7cf8ebb403ca..f62c64953df4 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 = 4342131256012953611L;
+    private static final long serialVersionUID = -8587892842347211953L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/scripts/Test/Common/ProcessFailedException.java b/slice2java/scripts/Test/Common/ProcessFailedException.java
index 38e87553b4aa..1dc6777e7b96 100644
--- a/slice2java/scripts/Test/Common/ProcessFailedException.java
+++ b/slice2java/scripts/Test/Common/ProcessFailedException.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5103744272136864343L;
+    private static final long serialVersionUID = 5103746994551630355L;
 }
diff --git a/slice2java/scripts/Test/Common/TestCaseFailedException.java b/slice2java/scripts/Test/Common/TestCaseFailedException.java
index d8fc3c895943..be2a05b1cb03 100644
--- a/slice2java/scripts/Test/Common/TestCaseFailedException.java
+++ b/slice2java/scripts/Test/Common/TestCaseFailedException.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7577593891562438981L;
+    private static final long serialVersionUID = 7577602069137906049L;
 }
diff --git a/slice2java/scripts/Test/Common/TestCaseNotExistException.java b/slice2java/scripts/Test/Common/TestCaseNotExistException.java
index 0e0fe9f4a624..96a3bd389515 100644
--- a/slice2java/scripts/Test/Common/TestCaseNotExistException.java
+++ b/slice2java/scripts/Test/Common/TestCaseNotExistException.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8656773975591969061L;
+    private static final long serialVersionUID = -8656782483783236449L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java
index 3c5eae2a46a2..b8699ea0a575 100644
--- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java
+++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8990431727147285081L;
+    private static final long serialVersionUID = 8990436522356276182L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java
index 9182510d9d49..11fb37839c7f 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 = 5986346778994879818L;
+    private static final long serialVersionUID = 1639272838647865439L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java
index a60596e3e253..b860c663a629 100644
--- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java
+++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5089366953015109116L;
+    private static final long serialVersionUID = -5089366509778251972L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java
index 8e89edb107ea..117ec475381f 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 = -8515276103431768069L;
+    private static final long serialVersionUID = 9113600935416740537L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java
index 81812731cc42..7919cdb53be6 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 = -1231636519331255823L;
+    private static final long serialVersionUID = -3853616024616344591L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java
index c8dbb9c6e6f5..67d7318ff081 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 = -7239206615531708358L;
+    private static final long serialVersionUID = 487055837636894650L;
 
     /** @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 4df2e2d3434d..bf3b7d44d313 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 = 6461856775107061783L;
+    private static final long serialVersionUID = 4335787305933206039L;
 
     /** @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 5febdfdffca1..393d22d50775 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 = -3670506354226448123L;
+    private static final long serialVersionUID = 3794862135149025907L;
 
     /** @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 ab649b706f75..ca8fa60fa3d6 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 = 3197238379268633711L;
+    private static final long serialVersionUID = 4084038178467818031L;
 
     /** @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 fff5c5cfa020..fcc848bfce5c 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 = -7359886862513643522L;
+    private static final long serialVersionUID = 4113865878973321416L;
 
     /** @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 8fda49805596..a8f51a4c3a0c 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 = 4377130774725552888L;
+    private static final long serialVersionUID = -4978251356018467784L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java
index ba3607c929b2..9c7d0e65b93f 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 = -2874097639175671965L;
+    private static final long serialVersionUID = 3528665743374824277L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java
index 2c1dda2626c9..2035b1b85589 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 = -28820314465836507L;
+    private static final long serialVersionUID = -4070982442758667803L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java
index 96c682107b3f..26009b4ab1d8 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 = 6414897374556167226L;
+    private static final long serialVersionUID = 5440830206303572764L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java
index c82955dc2159..891b65caee27 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 = -5959807717594339996L;
+    private static final long serialVersionUID = 7673262535694938980L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java
index a6d55b0b9c4a..73ade9cbe25c 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5447242530015831507L;
+    private static final long serialVersionUID = 5447252740361424926L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java
index 550f2c974331..ba0c4110d628 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 = 1811061519419970829L;
+    private static final long serialVersionUID = 6143672249783449726L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java
index 58379a6c0ced..8894ad8a0b9c 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 = -2405286192044899761L;
+    private static final long serialVersionUID = 705779173607816805L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java
index a3d80177c266..a90f0faf2691 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 = 8196997173434698342L;
+    private static final long serialVersionUID = 4296357489169319561L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java
index 20c760651a79..e796178ff414 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -243192523133684005L;
+    private static final long serialVersionUID = -243182312788106986L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java
index 21fa236b3b9f..9bb4f809bfc5 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 = 7644443261923982546L;
+    private static final long serialVersionUID = 7644443158451188289L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java
index 1021db9c882b..cf3d08f6d723 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4699855728964030739L;
+    private static final long serialVersionUID = 4699860649456823390L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java
index 76d43c3051c5..90a73454f14f 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 = 6865854626484937663L;
+    private static final long serialVersionUID = 4453126327864054700L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java
index 044a839dda9f..bb00ab0fb208 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 = -4980255743799061744L;
+    private static final long serialVersionUID = -7611203983855493260L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java
index f5bb8ea16306..f2adf77e3f13 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7270580311012439972L;
+    private static final long serialVersionUID = -7270586223200834927L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java
index 7f87778d1034..77688938b3c8 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 = 1034221176040143400L;
+    private static final long serialVersionUID = 6867798379258226651L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java
index 75dde44a2e38..71997270dd21 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 = -3649176832986758503L;
+    private static final long serialVersionUID = 4256697817117329435L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java
index 8bf247796d08..9d16ce5fa004 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4463360605704959674L;
+    private static final long serialVersionUID = 4463365443391916151L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java
index fdf8d2a02763..d607201a0f94 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 = -1971524790013553740L;
+    private static final long serialVersionUID = -1971524846926762969L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java
index 73e62f9f6fae..952dcd8740a4 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 = -2108797756841907467L;
+    private static final long serialVersionUID = -2108797852575093786L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java
index c9a29225523a..187b491e744e 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 = 2812948904337802384L;
+    private static final long serialVersionUID = -3156268408985274096L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java
index 85d7d3043ddb..6779c309b0eb 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6801505602143030694L;
+    private static final long serialVersionUID = -6801500604010311017L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java
index 84921c59b0e9..924aeee75be3 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 = -5945435607173484746L;
+    private static final long serialVersionUID = 7961027537995504598L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java
index 37e5d4ff6cc9..6b048a20dd28 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java
@@ -78,5 +78,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8985148192834499607L;
+    private static final long serialVersionUID = -8985147575512856796L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java
index 3e7e59cfdc93..6f0c48e03166 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 = 2337758725521252537L;
+    private static final long serialVersionUID = 2337758795055681962L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java
index bd487e1e521c..3fa9543d25e4 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 = -6003723355656362073L;
+    private static final long serialVersionUID = -6003723252349313484L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java
index 285c6668fb75..b00dec579ed4 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 = 2553834810564649635L;
+    private static final long serialVersionUID = -3656378424017753489L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java
index 927d8158f3cd..1047fda110d0 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 = -8970860787982214303L;
+    private static final long serialVersionUID = 8758407455859570817L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java
index 43b5394cf40f..b30c55fc4e74 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 = -6474338598657614263L;
+    private static final long serialVersionUID = 2491510773708832877L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java
index 83b9e7ee9831..a8ed51b6562d 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 = 8059524280134529972L;
+    private static final long serialVersionUID = -1106863807882829478L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java
index 5dead53439d7..f46ac20ce514 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5774528847704081786L;
+    private static final long serialVersionUID = -5774528147576458805L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java
index 70551f14b9c8..a6bd2f800950 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java
@@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5836493901312372956L;
+    private static final long serialVersionUID = -5960372757088929500L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java
index 8f0d904ea83c..7e5c1bbec059 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 = 6379514033400600681L;
+    private static final long serialVersionUID = 615284972909827145L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java
index d0f07f4e0776..c068159e4444 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 = -2307945376766057762L;
+    private static final long serialVersionUID = -8281482800536296179L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java
index dd20ad1f7e20..219cd94abf62 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6991429630796792668L;
+    private static final long serialVersionUID = 6991428925655378967L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java
index 52113beee64e..60de5c11ca9f 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 = 123144908809332493L;
+    private static final long serialVersionUID = -5410722456482716857L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java
index b9c3230b5ac5..33eb03171b35 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7672367127256613633L;
+    private static final long serialVersionUID = 7672378577259875274L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java
index c384b0caf084..b35b300a4e30 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java
@@ -74,5 +74,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2733094323806883279L;
+    private static final long serialVersionUID = 2733089573635781380L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java
index 923af7e7cdcf..2d943879edab 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5694235561976639254L;
+    private static final long serialVersionUID = -5694238968931141576L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java
index 4659bbb19e1c..9a307b5bfb77 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7526795087258356175L;
+    private static final long serialVersionUID = 7526795709746018818L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java
index b26742932469..bb8295baa80d 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 = 2506894424822315940L;
+    private static final long serialVersionUID = -7767641405470906172L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java
index eb791e83995f..69b0bef5df30 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 = 6396853802821003429L;
+    private static final long serialVersionUID = -4632000845743389467L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java
index 3fb2b1800fc1..d153f9201086 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 = 7977236550768683495L;
+    private static final long serialVersionUID = -5596577006029026073L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java
index 48dbf9452989..bb40af10034c 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8544189910677879923L;
+    private static final long serialVersionUID = 8544200115857740990L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java
index 70abc69b3daf..0a86ece89a47 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java
@@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6384138457037053681L;
+    private static final long serialVersionUID = 8914544375411980785L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java
index ea4fec4d31fa..998757fa00b5 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 = 8502294191490887393L;
+    private static final long serialVersionUID = -2920087274397216927L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java
index 74eee2258760..48697f9e4f8c 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 = 7787013335134475636L;
+    private static final long serialVersionUID = 6543750003626817703L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java
index ca8d1db3b194..29ad0f0c6d91 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 = -3119789815797446802L;
+    private static final long serialVersionUID = 7043938166682588547L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java
index cfd792e36f70..2d370d90e316 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 = -7652734798461530533L;
+    private static final long serialVersionUID = -2289376286217166330L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java
index 7374207b8a21..3df2c1994083 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 = -2231559045468524848L;
+    private static final long serialVersionUID = 6907657951401893264L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java
index 675e04ad2206..4b541f901f35 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2699425146259885271L;
+    private static final long serialVersionUID = -2699419239085441180L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java
index 402baf386c68..666f3b4c9b8d 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java
@@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9061577372756217L;
+    private static final long serialVersionUID = 4166058764889134471L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java
index 206ddd80c1e3..697f0fd58d18 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java
@@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3614608586798356991L;
+    private static final long serialVersionUID = 7382448868482847487L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java
index 8d7d4b879e79..95afdb6a5bf6 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java
@@ -82,5 +82,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -325455871790047903L;
+    private static final long serialVersionUID = -3395155685787549599L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java
index 52f9546ccb5f..f1e3eab83799 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 = 2199684370594331577L;
+    private static final long serialVersionUID = -1804209286591481703L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java
index e994e8d346e6..0e0d8bba151e 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 = 1762604280368310959L;
+    private static final long serialVersionUID = 8426733588024605167L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java
index b012058fb605..4789c8c3cac5 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 = -5453042422425865549L;
+    private static final long serialVersionUID = -4590743536743496032L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java
index fae5434d70bc..b4b0f3e18573 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7896657934280173242L;
+    private static final long serialVersionUID = 7896656795209880717L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java
index 02d0450b11ef..f8d0deb7af55 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 = -7410558082895097368L;
+    private static final long serialVersionUID = 1229703299765308024L;
 
     /** @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 c08c0400b7bd..045d015a4d12 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 = 572512002795415041L;
+    private static final long serialVersionUID = -6903621169200253951L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java
index 13f159a7460b..bef6e4eb57fa 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1090059768210072165L;
+    private static final long serialVersionUID = -1090058342576915540L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java
index f3451840b450..726c70544612 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 243151732336679219L;
+    private static final long serialVersionUID = 243158613282474308L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java
index c39c6a52a8ce..8bb0a9d03944 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 = -2785799363340669662L;
+    private static final long serialVersionUID = -6805810220724743531L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java
index a7df3011556a..c504f16a2818 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8653868944324433313L;
+    private static final long serialVersionUID = -8653878914623034904L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java
index e717207bf234..8fb386003f1e 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6283735236562443394L;
+    private static final long serialVersionUID = -6283747771564494135L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java
index f2500fc92f09..789384eea927 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java
@@ -71,5 +71,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3979361445118041682L;
+    private static final long serialVersionUID = 3979365595748612773L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Base.java b/slice2java/swift/test/Ice/defaultValue/Test/Base.java
index 557a02e8ca82..db8fc341f249 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 = 3849544552431157869L;
+    private static final long serialVersionUID = -5584671074740501513L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java
index 0bbf6433df3b..7987030f1d15 100644
--- a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java
@@ -185,5 +185,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6478184880740865895L;
+    private static final long serialVersionUID = -6407530165221910909L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java
index 13986d1345b8..f3beec6f7a2c 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 = 6692797536508196144L;
+    private static final long serialVersionUID = -6385069331896867782L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java
index 16d6760d3118..8b9bd52490cb 100644
--- a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java
@@ -109,5 +109,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2130978894021005433L;
+    private static final long serialVersionUID = 8986258212816762253L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java
index 58605130d2ab..479a2391ccf1 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 = 3986971628420631261L;
+    private static final long serialVersionUID = -7867316217272825683L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java
index 48029754b682..58a5b91657af 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 = 5519731978690634111L;
+    private static final long serialVersionUID = -1779924951074585290L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java
index d776bd2b2e17..950f7f310148 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 = -2386129847850524577L;
+    private static final long serialVersionUID = 164925208765441967L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/A.java b/slice2java/swift/test/Ice/exceptions/Test/A.java
index 0a9d160d1a5f..821cf3247c0d 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/A.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/A.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823745090964165425L;
+    private static final long serialVersionUID = 7823740712901554303L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/B.java b/slice2java/swift/test/Ice/exceptions/Test/B.java
index e6412aba8c7c..b883e02f31a5 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/B.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/B.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861410807547849999L;
+    private static final long serialVersionUID = -3861420806079062465L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/C.java b/slice2java/swift/test/Ice/exceptions/Test/C.java
index 13ef6910dbae..92b1808ccb7f 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/C.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/C.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080698782166950705L;
+    private static final long serialVersionUID = 1080694404104339583L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/D.java b/slice2java/swift/test/Ice/exceptions/Test/D.java
index daf9667d5eac..f783b2e73a55 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/D.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/D.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780381460554228209L;
+    private static final long serialVersionUID = 4780371462023015743L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/E.java b/slice2java/swift/test/Ice/exceptions/Test/E.java
index 2f66b46a52cd..784b9c1535b7 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/E.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/E.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1876968115939765044L;
+    private static final long serialVersionUID = -1876979271625867262L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/F.java b/slice2java/swift/test/Ice/exceptions/Test/F.java
index c1d0cbc9c53c..ed91a931d910 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/F.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/F.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 733475270815925583L;
+    private static final long serialVersionUID = 733469575446908929L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java
index 08e1882cd0b8..86bdc50ced45 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641414105006971995L;
+    private static final long serialVersionUID = -4641408884898037269L;
 }
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java
index 6a108e10076c..228dfb29814e 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 = 954231850375931571L;
+    private static final long serialVersionUID = 954228185341628763L;
 
     /** @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 9c997e2bc195..6fa875874314 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 = 1339641695851031593L;
+    private static final long serialVersionUID = 1339637348912442305L;
 
     /** @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 2b8ed6ae832a..cf1ae19672af 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 = -2729304040596478933L;
+    private static final long serialVersionUID = -2729308387525868349L;
 
     /** @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 33c59a1b4706..9fbf90dc317c 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 = -3435401394070229715L;
+    private static final long serialVersionUID = -3435405741008819003L;
 
     /** @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 d7362fc06d38..f9408665f252 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 = -836184247823535500L;
+    private static final long serialVersionUID = -836179735273310884L;
 
     /** @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 ef4ec555a9af..ed17dfd01d67 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 = 1132530663812120265L;
+    private static final long serialVersionUID = 1132531601422470497L;
 
     /** @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 68cdab83bda1..fece15936a20 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 = -6335552712780157493L;
+    private static final long serialVersionUID = -6335551775169807261L;
 
     /** @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 5f3ba7cf1fa9..e7ce6403e1de 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 = -4007412929727680819L;
+    private static final long serialVersionUID = -4007411992117330587L;
 
     /** @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 71e629249434..6e104b525891 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 = 991425518185191349L;
+    private static final long serialVersionUID = 991421853141688669L;
 
     /** @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 e9dfdfe2409e..95535aecdd6b 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 = -2880326250978780055L;
+    private static final long serialVersionUID = -2880330598211765503L;
 
     /** @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 781c4c1b815c..f964fdeb72e6 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 = -8808265202810514069L;
+    private static final long serialVersionUID = -8808269550052699389L;
 
     /** @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 e98c4a7fa96b..e4633910dd12 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 = -771856140342595987L;
+    private static final long serialVersionUID = -771860487575581435L;
 
     /** @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 ccfb0d7c7a73..435e91ed8f13 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 = 6566346023181384310L;
+    private static final long serialVersionUID = 6566350535722409054L;
 
     /** @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 b06bf882b466..0421448a6d23 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 = 6983807578641476361L;
+    private static final long serialVersionUID = 6983808516251826593L;
 
     /** @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 a69edc2bd90f..506817ffc46d 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 = -1175216892323693045L;
+    private static final long serialVersionUID = -1175215954713342813L;
 
     /** @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 0bb25e3ad3e1..f5910dd1cb21 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 = -3279721227915301363L;
+    private static final long serialVersionUID = -3279720290304951131L;
 
     /** @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 438bb946f0d1..cc6ccac642e2 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 = -4359180470338347593L;
+    private static final long serialVersionUID = -4359184135372650401L;
 
     /** @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 4289e0796ace..de13001f72e0 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 = 5904698483402419625L;
+    private static final long serialVersionUID = 5904694136463830337L;
 
     /** @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 a9c4e6c4318e..2e13d3a1a8ef 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 = 1835752746954909099L;
+    private static final long serialVersionUID = 1835748400025519683L;
 
     /** @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 83673ac58219..02aab29a9620 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 = -2252402047300546899L;
+    private static final long serialVersionUID = -2252406394239136187L;
 
     /** @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 447bbb897a7d..def064cc7e24 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 = -1203531088260718728L;
+    private static final long serialVersionUID = -1203527257605580720L;
 
     /** @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 e00297017064..2a2e0a00d17a 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 = -7537761367775164855L;
+    private static final long serialVersionUID = -7537760430164814623L;
 
     /** @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 74ecf3f69763..8673a61fc6e6 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 = 3440899329342109003L;
+    private static final long serialVersionUID = 3440900266952459235L;
 
     /** @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 a9b9bc5b1c62..61e55e951aaa 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 = 9151096553176290893L;
+    private static final long serialVersionUID = 9151097490786641125L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/A.java b/slice2java/swift/test/Ice/objects/Test/A.java
index 0fd9ffb76568..23095af1e3d5 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 = 5007440770960475899L;
+    private static final long serialVersionUID = -5770548883568674629L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/A1.java b/slice2java/swift/test/Ice/objects/Test/A1.java
index 3cc156e63990..4b699e46e78c 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 = -5926743754513304977L;
+    private static final long serialVersionUID = -5926745922968458465L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/B.java b/slice2java/swift/test/Ice/objects/Test/B.java
index 64d8906f97ac..b6ee60f58b29 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 = -8890915249770416033L;
+    private static final long serialVersionUID = -8890918288514113681L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/B1.java b/slice2java/swift/test/Ice/objects/Test/B1.java
index a7e084fe8a73..9f94f8a09ea6 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 = 6321736967826984324L;
+    private static final long serialVersionUID = -1083818463345294076L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Base.java b/slice2java/swift/test/Ice/objects/Test/Base.java
index 7861f2138bb2..aeab21d14c80 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 = 6028919523784023798L;
+    private static final long serialVersionUID = -7022592760566637642L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/BaseEx.java b/slice2java/swift/test/Ice/objects/Test/BaseEx.java
index fea7d063d72a..ca10bf607bfc 100644
--- a/slice2java/swift/test/Ice/objects/Test/BaseEx.java
+++ b/slice2java/swift/test/Ice/objects/Test/BaseEx.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3897766986247243197L;
+    private static final long serialVersionUID = 3897763621740813261L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/C.java b/slice2java/swift/test/Ice/objects/Test/C.java
index 9f49903d9dd4..95c6705ffa89 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 = 2057618485907378996L;
+    private static final long serialVersionUID = 1898978350634087684L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/COneMember.java b/slice2java/swift/test/Ice/objects/Test/COneMember.java
index db8fb8cc484b..1da95365fd2b 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 = 3050979230412250823L;
+    private static final long serialVersionUID = 3050977139601581879L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java
index d505810085ac..6e3725ed63c4 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 = -6019512383500040485L;
+    private static final long serialVersionUID = -5657524977369152357L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/D.java b/slice2java/swift/test/Ice/objects/Test/D.java
index 6bb7a8eb1b77..bc4fc1c6cb42 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 = 3949055060533808032L;
+    private static final long serialVersionUID = -8980089203732498928L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/D1.java b/slice2java/swift/test/Ice/objects/Test/D1.java
index 2e388b83346b..c71f5210c3e6 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 = -5200113947948170045L;
+    private static final long serialVersionUID = -7193038653683721277L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Derived.java b/slice2java/swift/test/Ice/objects/Test/Derived.java
index b134bcf47d19..079166f81dd5 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 = -1587930665280066373L;
+    private static final long serialVersionUID = -1587923731296609410L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/E.java b/slice2java/swift/test/Ice/objects/Test/E.java
index 2e2d38895f48..b30b1b0d3fd6 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 = 9026767929769926033L;
+    private static final long serialVersionUID = -8526914276467506735L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/EBase.java b/slice2java/swift/test/Ice/objects/Test/EBase.java
index a674d4d53172..ba3a7a31a137 100644
--- a/slice2java/swift/test/Ice/objects/Test/EBase.java
+++ b/slice2java/swift/test/Ice/objects/Test/EBase.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2540885298138974642L;
+    private static final long serialVersionUID = 7407122788046499534L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/EDerived.java b/slice2java/swift/test/Ice/objects/Test/EDerived.java
index 486325f87528..3fb835cf1a0f 100644
--- a/slice2java/swift/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/swift/test/Ice/objects/Test/EDerived.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7210098428451666L;
+    private static final long serialVersionUID = 3414960356549124946L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/EOneMember.java b/slice2java/swift/test/Ice/objects/Test/EOneMember.java
index 44f340751b0c..18e040f1a244 100644
--- a/slice2java/swift/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/swift/test/Ice/objects/Test/EOneMember.java
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225290279946790840L;
+    private static final long serialVersionUID = -6225292283089583624L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java
index b08b31e8aa0c..f44bd83845fd 100644
--- a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java
@@ -76,5 +76,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5276060808376552876L;
+    private static final long serialVersionUID = -3542397517172486380L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/F.java b/slice2java/swift/test/Ice/objects/Test/F.java
index 8c9552dacc63..eac7d1031d12 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 = -6208005700355785455L;
+    private static final long serialVersionUID = -1780236171807370799L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/F1.java b/slice2java/swift/test/Ice/objects/Test/F1.java
index 9c4c01849e0d..182083d3afa9 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 = 6192369517593208740L;
+    private static final long serialVersionUID = 6192373652875725151L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/F3.java b/slice2java/swift/test/Ice/objects/Test/F3.java
index 0fd304716067..df8565f8e4b3 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 = 6497435980247597639L;
+    private static final long serialVersionUID = 827873116243576839L;
 
     /** @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 a8b6a28ebc8e..e35bf542e3e9 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 = -1425257385893222667L;
+    private static final long serialVersionUID = -1425260915707552891L;
 
     /** @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 f44449938688..43c98e43d25e 100644
--- a/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337225628722543402L;
+    private static final long serialVersionUID = -2337229075731265114L;
 }
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 2801bd53fc52..b5355a0075f2 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 = -1298675940473322317L;
+    private static final long serialVersionUID = -1298679474957841853L;
 
     /** @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 53f7e9d7a799..c43496efb94a 100644
--- a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842241680720194802L;
+    private static final long serialVersionUID = 1842238228555088578L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/K.java b/slice2java/swift/test/Ice/objects/Test/K.java
index 431b82aeb09a..1d97bd181379 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 = 4645159705498615728L;
+    private static final long serialVersionUID = 4645161878811440896L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/L.java b/slice2java/swift/test/Ice/objects/Test/L.java
index c94e310e8101..072c2f3aa492 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 = 6629735879950368100L;
+    private static final long serialVersionUID = 6629739409613039700L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/M.java b/slice2java/swift/test/Ice/objects/Test/M.java
index cd2721bcf426..7c22ae6709ee 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 = -8088100819411489334L;
+    private static final long serialVersionUID = -8088097532554283142L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Recursive.java b/slice2java/swift/test/Ice/objects/Test/Recursive.java
index 342845dbfe15..d6aad4be0e53 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 = 3617875790595860719L;
+    private static final long serialVersionUID = 3617877963904114527L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/S.java b/slice2java/swift/test/Ice/objects/Test/S.java
index 6ccbf1fdc37d..30e4eea17425 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 = 481769807105716951L;
+    private static final long serialVersionUID = 481772058214820327L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/SOneMember.java b/slice2java/swift/test/Ice/objects/Test/SOneMember.java
index 876191773bb0..fcb3ba976027 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 = 6227751128544355934L;
+    private static final long serialVersionUID = 6227753053895187438L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java
index 3625728e507a..7e00903e5a40 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 = -8276598982421962302L;
+    private static final long serialVersionUID = -8227055633325455742L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/StructKey.java b/slice2java/swift/test/Ice/objects/Test/StructKey.java
index d0e39fdda3bc..eed93ca55944 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 = -6788740331806522787L;
+    private static final long serialVersionUID = -8788518042820733283L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java
index 39005845c703..abbd50452504 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 = 2723843456983602483L;
+    private static final long serialVersionUID = 2723850819711479924L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/MyClass1.java b/slice2java/swift/test/Ice/operations/Test/MyClass1.java
index 64c4c285b731..3fcc64385ba7 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 = 2686541551987365945L;
+    private static final long serialVersionUID = -4556225497016290722L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct.java b/slice2java/swift/test/Ice/operations/Test/MyStruct.java
index 08bfc96bd4f7..53bd4857f283 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 = 4602692882670762749L;
+    private static final long serialVersionUID = -1542228743386904995L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java
index eb5fc65be101..0d227ae603a2 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 = 6517287947876034032L;
+    private static final long serialVersionUID = 7053154892104110295L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/Structure.java b/slice2java/swift/test/Ice/operations/Test/Structure.java
index 7bd7223e39df..098c249aaa3c 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 = -7633277892797997508L;
+    private static final long serialVersionUID = 1724894134525785115L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/A.java b/slice2java/swift/test/Ice/optional/Test/A.java
index 60fcfb5a6eaf..99e220a819fc 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 = 3110485844860301456L;
+    private static final long serialVersionUID = -3829940131101209200L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/B.java b/slice2java/swift/test/Ice/optional/Test/B.java
index f40875b28f98..eda8abfcd004 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 = 1579746886521220003L;
+    private static final long serialVersionUID = -76163322802492957L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/C.java b/slice2java/swift/test/Ice/optional/Test/C.java
index 9e1fa3337ba6..a004abc777f4 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 = -7273187901119667203L;
+    private static final long serialVersionUID = 5316058249259676029L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/DerivedException.java b/slice2java/swift/test/Ice/optional/Test/DerivedException.java
index f427fdddf2d8..db63274eb67a 100644
--- a/slice2java/swift/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/swift/test/Ice/optional/Test/DerivedException.java
@@ -158,5 +158,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3733237193236459105L;
+    private static final long serialVersionUID = 3518756787465759267L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/E.java b/slice2java/swift/test/Ice/optional/Test/E.java
index a899255ea579..a9c5f6140b67 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 = -1850739390277520240L;
+    private static final long serialVersionUID = -1850742821843583595L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/F.java b/slice2java/swift/test/Ice/optional/Test/F.java
index 5b88f854d3de..e53931f4d420 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 = -6430492899890140701L;
+    private static final long serialVersionUID = -6430489468333290138L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java
index 2ca9d9ed03a3..8bea9af71477 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 = 1569601233087757254L;
+    private static final long serialVersionUID = 1569604744650690195L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/G.java b/slice2java/swift/test/Ice/optional/Test/G.java
index 3ebf8b2a39a4..2fc29f3e9530 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 = -8362786986741577517L;
+    private static final long serialVersionUID = -8839728163878884269L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/G1.java b/slice2java/swift/test/Ice/optional/Test/G1.java
index 5de33c57561f..0ccf5bdb2749 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 = 7339784424010994415L;
+    private static final long serialVersionUID = 7339781243140263469L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/G2.java b/slice2java/swift/test/Ice/optional/Test/G2.java
index 341bdf317262..c940c1cfd6a1 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 = 3824551223065526850L;
+    private static final long serialVersionUID = 3824547791490391027L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java
index c5566bcd2092..4bcf4433a8d6 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 = -6030275530800438144L;
+    private static final long serialVersionUID = 7512469772852224265L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/OneOptional.java b/slice2java/swift/test/Ice/optional/Test/OneOptional.java
index cd1377a06ef0..c219d2d108c3 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 = -7219599034019874200L;
+    private static final long serialVersionUID = -7219601303196377539L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalException.java b/slice2java/swift/test/Ice/optional/Test/OptionalException.java
index 1d0727f9f53b..f4b3c50cc7e7 100644
--- a/slice2java/swift/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/swift/test/Ice/optional/Test/OptionalException.java
@@ -210,5 +210,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3156102578810138501L;
+    private static final long serialVersionUID = 5333032320211582981L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java
index c995339a8163..9642b70a2b31 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 = 46128174254014651L;
+    private static final long serialVersionUID = 6490217876455891131L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/RequiredException.java b/slice2java/swift/test/Ice/optional/Test/RequiredException.java
index a25a7e0096bf..a66934a5cdf0 100644
--- a/slice2java/swift/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/swift/test/Ice/optional/Test/RequiredException.java
@@ -81,5 +81,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894238447319274086L;
+    private static final long serialVersionUID = 2894235186370626980L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java
index c5799399a570..48d2883d01cc 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 = 6700987678894518876L;
+    private static final long serialVersionUID = 6700991270551646219L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/VarStruct.java b/slice2java/swift/test/Ice/optional/Test/VarStruct.java
index cacfac729a7b..9c97d1909142 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 = -1912284443573167001L;
+    private static final long serialVersionUID = -1912287624443897947L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/WD.java b/slice2java/swift/test/Ice/optional/Test/WD.java
index ac306427b68a..47652aa1385d 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 = 806193927409663367L;
+    private static final long serialVersionUID = -1439954993987643280L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C.java b/slice2java/swift/test/Ice/scope/Test/C.java
index c834b58041e1..402b5b39a97d 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 = -5190248689283318734L;
+    private static final long serialVersionUID = -5190243854022647276L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C1.java b/slice2java/swift/test/Ice/scope/Test/C1.java
index a4fd9d4cb379..3f0249fc164d 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 = 8893234271232086670L;
+    private static final long serialVersionUID = 8893235216752381480L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C2.java b/slice2java/swift/test/Ice/scope/Test/C2.java
index b0e1e3cc5f2b..f09dd4995273 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 = 322498873833847331L;
+    private static final long serialVersionUID = -8750883679941751547L;
 
     /** @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 c0711496bef9..5ac3021cd253 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 = 4615627232048645437L;
+    private static final long serialVersionUID = 4615627604147683355L;
 
     /** @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 995c05d043dd..259f8368dabf 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 = 672592755292276128L;
+    private static final long serialVersionUID = 672588157823131142L;
 
     /** @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 2f6513003730..05238a7822a2 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 = 8654438032707825805L;
+    private static final long serialVersionUID = 8654437417955137771L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/S.java
index 27818ba40770..7c5462f06ac6 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 = 3694620024710001089L;
+    private static final long serialVersionUID = 3694614109791446567L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S.java b/slice2java/swift/test/Ice/scope/Test/S.java
index a1ae3fb544a3..29b4005d3ca1 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 = 2159701673122924479L;
+    private static final long serialVersionUID = 2159701884919067161L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S1.java b/slice2java/swift/test/Ice/scope/Test/S1.java
index 97d22995c20e..1080e544f5cf 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 = 1241678803634463543L;
+    private static final long serialVersionUID = 1241683633738750609L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S2.java b/slice2java/swift/test/Ice/scope/Test/S2.java
index f3c2c44d5eda..8eb91c3ae077 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 = -3488669436065108262L;
+    private static final long serialVersionUID = -3647955020573568004L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java
index 00a85a453314..e2b0b102a929 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477020047715668653L;
+    private static final long serialVersionUID = -477019768768570792L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 87eee253946f..2fcfc59eab07 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485212717551025397L;
+    private static final long serialVersionUID = 3485213161663843582L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 52fc089b8221..fe807ba2b2f4 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717373643927557508L;
+    private static final long serialVersionUID = 1717374047008944399L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 502f888ebf76..c093df76b615 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384913965450850467L;
+    private static final long serialVersionUID = -7384914203067516970L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index a486b467dd2a..71d22f4ecd3e 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424380304735593128L;
+    private static final long serialVersionUID = 3424370347512952264L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 7884d0d0b00f..156fbf0b3892 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172597857184888775L;
+    private static final long serialVersionUID = -1172598479515912551L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 54292ee42422..8d8630cde045 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126109087200395840L;
+    private static final long serialVersionUID = -1126113759726907680L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index ea0e25a2881e..1dfca5f3df14 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097573432682099552L;
+    private static final long serialVersionUID = -2097583389904740416L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/B.java b/slice2java/swift/test/Ice/slicing/objects/Test/B.java
index 781ecc03c984..63a999c2c544 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 = -8985661828902159520L;
+    private static final long serialVersionUID = -8843008396473949216L;
 
     /** @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 ebceab8aa740..43cd31662bac 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java
@@ -78,5 +78,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8641382391392762580L;
+    private static final long serialVersionUID = -462378951251106644L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 327b1ceae5fb..e7b9d798c3d3 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 = -6397001919199941917L;
+    private static final long serialVersionUID = -6396997104640636461L;
 
     /** @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 016e1d74f192..7dccbd38fa46 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 = -9066881078757348248L;
+    private static final long serialVersionUID = -9066879935848455940L;
 
     /** @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 01f298dc7bbc..7e3f7c0c46f4 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 = 2386374111599078595L;
+    private static final long serialVersionUID = -3172337587495915069L;
 
     /** @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 11053da6114b..a9ad6c06528b 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 = 4798950090361011626L;
+    private static final long serialVersionUID = 637936650026946109L;
 
     /** @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 ee50d12d0ada..2f9a4535fe16 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 = 6769986155228982635L;
+    private static final long serialVersionUID = 3646106591952078204L;
 
     /** @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 9f04deef8e99..2e3d08c77abb 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 = 7586037501669907507L;
+    private static final long serialVersionUID = 366149763565026675L;
 
     /** @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 4a2602c89c3c..e44a5be5d5dd 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7718020250213968598L;
+    private static final long serialVersionUID = 5109238730262207062L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java
index ed86f5f37ec2..af2f54a0aa6e 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 = -7655923005993807725L;
+    private static final long serialVersionUID = -7655919179343172601L;
 
     /** @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 41b26826bc34..6ffa411ce0c7 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 = -2271129019226563701L;
+    private static final long serialVersionUID = -2271133011193192289L;
 
     /** @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 aee6a4be30b7..91bb42d938c2 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 = 4147524950392184446L;
+    private static final long serialVersionUID = 4147525366109591545L;
 
     /** @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 4f3e5b8df7aa..87bc427719ce 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 = 481708734987807866L;
+    private static final long serialVersionUID = 481704947197390574L;
 
     /** @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 594f73abee31..653aba2c17fd 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 = -4426886946334453853L;
+    private static final long serialVersionUID = -4426887586935849453L;
 
     /** @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 ce8efbafc629..d4f15969041d 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 = 850538491334969493L;
+    private static final long serialVersionUID = 850544587079944508L;
 
     /** @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 39c204e5262b..d1b505ece7a9 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 = -4328898766807237050L;
+    private static final long serialVersionUID = -4328899405002007168L;
 
     /** @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 28fcbd25470d..420a334506f5 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 = -5081818517485081167L;
+    private static final long serialVersionUID = -5081817876928438843L;
 
     /** @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 8103717ca466..7c4e0f7f6e53 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 = 643079462627247023L;
+    private static final long serialVersionUID = 643078115585912507L;
 
     /** @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 79c13eca303c..d0dbb5941b53 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 = -2438007842780061917L;
+    private static final long serialVersionUID = -2438003530518750409L;
 
     /** @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 f2b5d874dd10..e20b48d56749 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 = 6012663369149338479L;
+    private static final long serialVersionUID = 1860984881349219710L;
 
     /** @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 523999991c2c..a47fd1eb9470 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 = -8813708536904640382L;
+    private static final long serialVersionUID = -8813706072814374164L;
 
     /** @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 ef8b40add243..64e0cddbeafa 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 = 3651528414048680101L;
+    private static final long serialVersionUID = 3651524422053345457L;
 
     /** @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 9ff0276dc37c..f38f1be456b2 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 = 8804376576756631296L;
+    private static final long serialVersionUID = 8804374909385223700L;
 
     /** @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 a9673c710f5a..335ac63d2eab 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 = -4989057194872870815L;
+    private static final long serialVersionUID = -4989069202787623557L;
 
     /** @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 19b5362a5fe3..d98df83bc7ff 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 = -5353761363247665994L;
+    private static final long serialVersionUID = -5353757216257757918L;
 
     /** @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 b746526b818d..1967e9ea4260 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 = -6522134832582995838L;
+    private static final long serialVersionUID = -6522133524412202858L;
 
     /** @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 5ff2d72f68e4..a0b33597c064 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 = 7620287549092166017L;
+    private static final long serialVersionUID = 7620286047028658453L;
 
     /** @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 fe1ae8ae0b7b..c962d6f63c83 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 = 3082394347168728667L;
+    private static final long serialVersionUID = 2795646000579205211L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java
index 020ebbc1b6b8..70bae367ff03 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 = -715696254641508022L;
+    private static final long serialVersionUID = 6761072326523274052L;
 
     /** @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 dfe7c08fe288..784b610d5b7e 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java
@@ -75,5 +75,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7636777848426239220L;
+    private static final long serialVersionUID = -2293613693507019598L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java
index cbcfb1760f81..34a067254165 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 = -2154585123758028899L;
+    private static final long serialVersionUID = -2849229629579555043L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/MyClass.java b/slice2java/swift/test/Ice/stream/Test/MyClass.java
index 481b17658c76..758042d42e4b 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 = -3055915507274272761L;
+    private static final long serialVersionUID = 8685055724471206983L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/stream/Test/MyException.java b/slice2java/swift/test/Ice/stream/Test/MyException.java
index 5ab1037753ee..e2a5731beba6 100644
--- a/slice2java/swift/test/Ice/stream/Test/MyException.java
+++ b/slice2java/swift/test/Ice/stream/Test/MyException.java
@@ -70,5 +70,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734228743904258569L;
+    private static final long serialVersionUID = 5734231249352074940L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java
index 00a978e77407..de7de96ebd77 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 = -7602078149616067301L;
+    private static final long serialVersionUID = -8641782560939094341L;
 
     /** @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 afc9b53596c7..d4f8f8726f5c 100644
--- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java
+++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1404701780632624071L;
+    private static final long serialVersionUID = -1404704645120436276L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java
index eb4d3d22a380..e1d123eaab35 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 = -737981204666098764L;
+    private static final long serialVersionUID = -545635942107609631L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java
index 862f83e4ecfe..62af418667bc 100644
--- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java
+++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java
@@ -65,5 +65,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8562121686280012277L;
+    private static final long serialVersionUID = -8562119222170984386L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java
index 7a0310f3666b..b5fbc4b9e652 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 = 6864476317658542817L;
+    private static final long serialVersionUID = 5632072091687151220L;
 }
diff --git a/slice2java/swift/test/Slice/escape/Clash/Cls.java b/slice2java/swift/test/Slice/escape/Clash/Cls.java
index 4f6e7f128fb7..b9fd5067f0d4 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 = 2793023061686399748L;
+    private static final long serialVersionUID = 7171387183643144051L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Slice/escape/Clash/Ex.java b/slice2java/swift/test/Slice/escape/Clash/Ex.java
index 382c12809328..94eb1ce7d6ff 100644
--- a/slice2java/swift/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/swift/test/Slice/escape/Clash/Ex.java
@@ -69,5 +69,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3850345374983964095L;
+    private static final long serialVersionUID = 6973932930455249855L;
 }
diff --git a/slice2java/swift/test/Slice/escape/Clash/St.java b/slice2java/swift/test/Slice/escape/Clash/St.java
index efd8bef30b09..e78322a701c3 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 = 7378923511578863721L;
+    private static final long serialVersionUID = -5895398607937754999L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/_return.java b/slice2java/swift/test/Slice/escape/and/_return.java
index 6806f96e052e..06275e825b76 100644
--- a/slice2java/swift/test/Slice/escape/and/_return.java
+++ b/slice2java/swift/test/Slice/escape/and/_return.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8206178693693065449L;
+    private static final long serialVersionUID = -8206187336353378115L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/_switch.java b/slice2java/swift/test/Slice/escape/and/_switch.java
index c9ed75129d7a..4bb7e86513f4 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 = -2370783433845752639L;
+    private static final long serialVersionUID = -4975054319132502805L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Slice/escape/and/as.java b/slice2java/swift/test/Slice/escape/and/as.java
index f7d0f93f5603..25170cb2aed5 100644
--- a/slice2java/swift/test/Slice/escape/and/as.java
+++ b/slice2java/swift/test/Slice/escape/and/as.java
@@ -73,5 +73,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5970637886030326008L;
+    private static final long serialVersionUID = -8597717325732517768L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/defer.java b/slice2java/swift/test/Slice/escape/and/defer.java
index 1d3dae26875c..646d9d9f9eef 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 = 8824790814376748525L;
+    private static final long serialVersionUID = 8824798780155781831L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/guard.java b/slice2java/swift/test/Slice/escape/and/guard.java
index c49d44293bee..615765b2f78c 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 = 6403709952576792097L;
+    private static final long serialVersionUID = 6403717665375601099L;
 }
diff --git a/slice2js/cpp/src/IceGrid/Internal.js b/slice2js/cpp/src/IceGrid/Internal.js
index 1cbe638adeed..87ce166cdd6f 100644
--- a/slice2js/cpp/src/IceGrid/Internal.js
+++ b/slice2js/cpp/src/IceGrid/Internal.js
@@ -630,8 +630,8 @@ Ice.defineOperations(
         "registerWellKnownObjects": [, 2, , , [[IceGrid.ObjectInfoSeqHelper]], , , , ],
         "setAdapterDirectProxy": [, 2, , , [[7], [7], [9]], ,
         [
-            IceGrid.AdapterNotExistException,
-            IceGrid.AdapterExistsException
+            IceGrid.AdapterExistsException,
+            IceGrid.AdapterNotExistException
         ], , ],
         "receivedUpdate": [, , , , [[IceGrid.TopicName._helper], [3], [7]], , , , ],
         "destroy": [, , , , , , , , ]
@@ -745,13 +745,13 @@ Ice.defineOperations(
     {
         "registerNode": [, , , ["IceGrid.NodeSessionPrx"], [["IceGrid.InternalNodeInfo", true], ["IceGrid.NodePrx"], [IceGrid.LoadInfo]], ,
         [
-            IceGrid.PermissionDeniedException,
-            IceGrid.NodeActiveException
+            IceGrid.NodeActiveException,
+            IceGrid.PermissionDeniedException
         ], true, ],
         "registerReplica": [, , , ["IceGrid.ReplicaSessionPrx"], [["IceGrid.InternalReplicaInfo", true], ["IceGrid.InternalRegistryPrx"]], ,
         [
-            IceGrid.PermissionDeniedException,
-            IceGrid.ReplicaActiveException
+            IceGrid.ReplicaActiveException,
+            IceGrid.PermissionDeniedException
         ], true, ],
         "registerWithReplica": [, , , , [["IceGrid.InternalRegistryPrx"]], , , , ],
         "getNodes": [, 2, , [IceGrid.NodePrxSeqHelper], , , , , ],
diff --git a/slice2swift/cpp/src/IceGrid/Internal.swift b/slice2swift/cpp/src/IceGrid/Internal.swift
index c3e05e806c61..b8c06d595eba 100644
--- a/slice2swift/cpp/src/IceGrid/Internal.swift
+++ b/slice2swift/cpp/src/IceGrid/Internal.swift
@@ -3929,10 +3929,10 @@ public extension ReplicaSessionPrx {
                           userException:{ ex in
                               do  {
                                   throw ex
-                              } catch let error as AdapterExistsException {
-                                  throw error
                               } catch let error as AdapterNotExistException {
                                   throw error
+                              } catch let error as AdapterExistsException {
+                                  throw error
                               } catch is Ice.UserException {}
                           },
                           context: context)
@@ -3969,10 +3969,10 @@ public extension ReplicaSessionPrx {
                                   userException:{ ex in
                                       do  {
                                           throw ex
-                                      } catch let error as AdapterExistsException {
-                                          throw error
                                       } catch let error as AdapterNotExistException {
                                           throw error
+                                      } catch let error as AdapterExistsException {
+                                          throw error
                                       } catch is Ice.UserException {}
                                   },
                                   context: context,
@@ -4267,10 +4267,10 @@ public extension InternalRegistryPrx {
                                  userException:{ ex in
                                      do  {
                                          throw ex
-                                     } catch let error as NodeActiveException {
-                                         throw error
                                      } catch let error as PermissionDeniedException {
                                          throw error
+                                     } catch let error as NodeActiveException {
+                                         throw error
                                      } catch is Ice.UserException {}
                                  },
                                  context: context)
@@ -4313,10 +4313,10 @@ public extension InternalRegistryPrx {
                                   userException:{ ex in
                                       do  {
                                           throw ex
-                                      } catch let error as NodeActiveException {
-                                          throw error
                                       } catch let error as PermissionDeniedException {
                                           throw error
+                                      } catch let error as NodeActiveException {
+                                          throw error
                                       } catch is Ice.UserException {}
                                   },
                                   context: context,
@@ -4355,10 +4355,10 @@ public extension InternalRegistryPrx {
                                  userException:{ ex in
                                      do  {
                                          throw ex
-                                     } catch let error as ReplicaActiveException {
-                                         throw error
                                      } catch let error as PermissionDeniedException {
                                          throw error
+                                     } catch let error as ReplicaActiveException {
+                                         throw error
                                      } catch is Ice.UserException {}
                                  },
                                  context: context)
@@ -4398,10 +4398,10 @@ public extension InternalRegistryPrx {
                                   userException:{ ex in
                                       do  {
                                           throw ex
-                                      } catch let error as ReplicaActiveException {
-                                          throw error
                                       } catch let error as PermissionDeniedException {
                                           throw error
+                                      } catch let error as ReplicaActiveException {
+                                          throw error
                                       } catch is Ice.UserException {}
                                   },
                                   context: context,
diff --git a/slice2swift/cpp/test/Ice/exceptions/TestAMD.swift b/slice2swift/cpp/test/Ice/exceptions/TestAMD.swift
index 30cb4b055918..a5c77ca8fc93 100644
--- a/slice2swift/cpp/test/Ice/exceptions/TestAMD.swift
+++ b/slice2swift/cpp/test/Ice/exceptions/TestAMD.swift
@@ -872,10 +872,10 @@ public extension ThrowerPrx {
                           userException:{ ex in
                               do  {
                                   throw ex
-                              } catch let error as A {
-                                  throw error
                               } catch let error as D {
                                   throw error
+                              } catch let error as A {
+                                  throw error
                               } catch is Ice.UserException {}
                           },
                           context: context)
@@ -904,10 +904,10 @@ public extension ThrowerPrx {
                                   userException:{ ex in
                                       do  {
                                           throw ex
-                                      } catch let error as A {
-                                          throw error
                                       } catch let error as D {
                                           throw error
+                                      } catch let error as A {
+                                          throw error
                                       } catch is Ice.UserException {}
                                   },
                                   context: context,