diff --git a/slice2cs/cpp/test/Ice/operations/Test.cs b/slice2cs/cpp/test/Ice/operations/Test.cs
index 6a366e8ee81d..6c3c2d37b9f5 100644
--- a/slice2cs/cpp/test/Ice/operations/Test.cs
+++ b/slice2cs/cpp/test/Ice/operations/Test.cs
@@ -13606,11 +13606,19 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract MyStruct1 opMyStruct1(MyStruct1 opMyStruct1, Ice.Current current);
 
-        public abstract int opByteSOnewayCallCount(Ice.Current current);
+        public abstract void shutdown(Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opContext(Ice.Current current);
+        public abstract bool supportsCompress(Ice.Current current);
 
-        public abstract int opInt1(int opInt1, 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);
 
@@ -13620,13 +13628,35 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract Structure opStruct(Structure p1, Structure p2, out Structure p3, Ice.Current current);
 
-        public abstract string[] opStringLiterals(Ice.Current current);
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
 
-        public abstract string[] opWStringLiterals(Ice.Current current);
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
 
-        public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(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 MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, 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);
 
@@ -13648,6 +13678,12 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p3, Ice.Current current);
 
+        public abstract global::System.Collections.Generic.Dictionary<byte, byte[]> opByteByteSD(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, out global::System.Collections.Generic.Dictionary<byte, byte[]> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<bool, bool[]> opBoolBoolSD(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, out global::System.Collections.Generic.Dictionary<bool, bool[]> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
+
         public abstract global::System.Collections.Generic.Dictionary<int, int[]> opIntIntSD(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, out global::System.Collections.Generic.Dictionary<int, int[]> p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<long, long[]> opLongLongSD(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, out global::System.Collections.Generic.Dictionary<long, long[]> p3, Ice.Current current);
@@ -13662,53 +13698,11 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract int[] opIntS(int[] s, 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 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 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<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 void opByteSOneway(byte[] s, 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 int opByteSOnewayCallCount(Ice.Current current);
 
-        public abstract void opByteSOneway(byte[] s, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opContext(Ice.Current current);
 
         public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current);
 
@@ -13718,6 +13712,8 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract short opShort1(short opShort1, Ice.Current current);
 
+        public abstract int opInt1(int opInt1, Ice.Current current);
+
         public abstract long opLong1(long opLong1, Ice.Current current);
 
         public abstract float opFloat1(float opFloat1, Ice.Current current);
@@ -13734,17 +13730,21 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
 
-        public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
+        public abstract string[] opStringLiterals(Ice.Current current);
 
-        public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
+        public abstract string[] opWStringLiterals(Ice.Current current);
 
-        public abstract void shutdown(Ice.Current current);
+        public abstract MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
 
-        public abstract bool supportsCompress(Ice.Current current);
+        public abstract MyClass_OpMStruct2MarshaledResult opMStruct2(Structure p1, Ice.Current current);
 
-        public abstract void opVoid(Ice.Current current);
+        public abstract MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
 
-        public abstract byte opByte(byte p1, byte p2, out byte p3, 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();
 
@@ -13839,11 +13839,19 @@ namespace Test2
 {
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
-        public abstract int opByteSOnewayCallCount(Ice.Current current);
+        public abstract void shutdown(Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opContext(Ice.Current current);
+        public abstract bool supportsCompress(Ice.Current current);
 
-        public abstract int opInt1(int opInt1, 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);
 
@@ -13853,13 +13861,35 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::Test.Structure opStruct(global::Test.Structure p1, global::Test.Structure p2, out global::Test.Structure p3, Ice.Current current);
 
-        public abstract string[] opStringLiterals(Ice.Current current);
+        public abstract byte[] opByteS(byte[] p1, byte[] p2, out byte[] p3, Ice.Current current);
 
-        public abstract string[] opWStringLiterals(Ice.Current current);
+        public abstract bool[] opBoolS(bool[] p1, bool[] p2, out bool[] p3, Ice.Current current);
 
-        public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(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 global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, 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);
 
@@ -13881,6 +13911,12 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<global::Test.MyStruct, global::Test.MyEnum>[] p3, Ice.Current current);
 
+        public abstract global::System.Collections.Generic.Dictionary<byte, byte[]> opByteByteSD(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, out global::System.Collections.Generic.Dictionary<byte, byte[]> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<bool, bool[]> opBoolBoolSD(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, out global::System.Collections.Generic.Dictionary<bool, bool[]> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
+
         public abstract global::System.Collections.Generic.Dictionary<int, int[]> opIntIntSD(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, out global::System.Collections.Generic.Dictionary<int, int[]> p3, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<long, long[]> opLongLongSD(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, out global::System.Collections.Generic.Dictionary<long, long[]> p3, Ice.Current current);
@@ -13895,53 +13931,11 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract int[] opIntS(int[] s, 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 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 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<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 void opByteSOneway(byte[] s, 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 int opByteSOnewayCallCount(Ice.Current current);
 
-        public abstract void opByteSOneway(byte[] s, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opContext(Ice.Current current);
 
         public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current);
 
@@ -13951,6 +13945,8 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract short opShort1(short opShort1, Ice.Current current);
 
+        public abstract int opInt1(int opInt1, Ice.Current current);
+
         public abstract long opLong1(long opLong1, Ice.Current current);
 
         public abstract float opFloat1(float opFloat1, Ice.Current current);
@@ -13967,17 +13963,21 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
 
-        public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
+        public abstract string[] opStringLiterals(Ice.Current current);
 
-        public abstract global::Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
+        public abstract string[] opWStringLiterals(Ice.Current current);
 
-        public abstract void shutdown(Ice.Current current);
+        public abstract global::Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
 
-        public abstract bool supportsCompress(Ice.Current current);
+        public abstract global::Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Test.Structure p1, Ice.Current current);
 
-        public abstract void opVoid(Ice.Current current);
+        public abstract global::Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
 
-        public abstract byte opByte(byte p1, byte p2, out byte p3, 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();
 
diff --git a/slice2cs/cpp/test/Ice/operations/TestAMD.cs b/slice2cs/cpp/test/Ice/operations/TestAMD.cs
index 0f21739c6b61..a544f37a6b0f 100644
--- a/slice2cs/cpp/test/Ice/operations/TestAMD.cs
+++ b/slice2cs/cpp/test/Ice/operations/TestAMD.cs
@@ -10024,20 +10024,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_OpStringMyEnumDSResult> opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary<string, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, MyEnum>[] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumStringDSResult> opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary<MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<MyEnum, string>[] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyStructMyEnumDSResult> opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteByteSDResult> opByteByteSDAsync(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolBoolSDResult> opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortShortSDResult> opShortShortSDAsync(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, Ice.Current current);
-
-        public abstract global::System.Threading.Tasks.Task<MyClass_OpIntIntSDResult> opIntIntSDAsync(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, Ice.Current current);
-
         public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
@@ -10104,6 +10090,20 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpStringStringDSResult> opStringStringDSAsync(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, Ice.Current current);
 
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpStringMyEnumDSResult> opStringMyEnumDSAsync(global::System.Collections.Generic.Dictionary<string, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, MyEnum>[] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyEnumStringDSResult> opMyEnumStringDSAsync(global::System.Collections.Generic.Dictionary<MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<MyEnum, string>[] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpMyStructMyEnumDSResult> opMyStructMyEnumDSAsync(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpByteByteSDResult> opByteByteSDAsync(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolBoolSDResult> opBoolBoolSDAsync(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpShortShortSDResult> opShortShortSDAsync(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, Ice.Current current);
+
+        public abstract global::System.Threading.Tasks.Task<MyClass_OpIntIntSDResult> opIntIntSDAsync(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, Ice.Current current);
+
         public abstract global::System.Threading.Tasks.Task<MyClass_OpLongLongSDResult> opLongLongSDAsync(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, Ice.Current current);
 
         public abstract global::System.Threading.Tasks.Task<MyClass_OpStringFloatSDResult> opStringFloatSDAsync(global::System.Collections.Generic.Dictionary<string, float[]> p1, global::System.Collections.Generic.Dictionary<string, float[]> p2, Ice.Current current);
diff --git a/slice2cs/csharp/test/Ice/operations/Test.cs b/slice2cs/csharp/test/Ice/operations/Test.cs
index 7be4a6c7ce5c..68c797c1f44d 100644
--- a/slice2cs/csharp/test/Ice/operations/Test.cs
+++ b/slice2cs/csharp/test/Ice/operations/Test.cs
@@ -13440,23 +13440,51 @@ 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 long opShortIntLong(short p1, int p2, long p3, out short p4, out int p5, out long p6, Ice.Current current);
 
-            public abstract bool supportsCompress(Ice.Current current);
+            public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
 
-            public abstract void opVoid(Ice.Current current);
+            public abstract string opString(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 MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
 
-            public abstract bool opBool(bool p1, bool p2, out bool 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 long opShortIntLong(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<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 double opFloatDouble(float p1, double p2, out float p3, out double p4, 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 opString(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 MyEnum opMyEnum(MyEnum p1, out MyEnum p2, Ice.Current current);
+            public abstract global::System.Collections.Generic.Dictionary<long, long[]> opLongLongSD(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, out global::System.Collections.Generic.Dictionary<long, long[]> p3, Ice.Current current);
+
+            public abstract global::System.Collections.Generic.Dictionary<string, float[]> opStringFloatSD(global::System.Collections.Generic.Dictionary<string, float[]> p1, global::System.Collections.Generic.Dictionary<string, float[]> p2, out global::System.Collections.Generic.Dictionary<string, float[]> p3, Ice.Current current);
+
+            public abstract void opByteSOneway(byte[] s, Ice.Current current);
+
+            public abstract int opByteSOnewayCallCount(Ice.Current current);
+
+            public abstract global::System.Collections.Generic.Dictionary<string, string> opContext(Ice.Current current);
+
+            public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current);
+
+            public abstract void opIdempotent(Ice.Current current);
+
+            public abstract byte opByte1(byte opByte1, Ice.Current current);
+
+            public abstract short opShort1(short opShort1, Ice.Current current);
+
+            public abstract int opInt1(int opInt1, Ice.Current current);
+
+            public abstract long opLong1(long opLong1, Ice.Current current);
+
+            public abstract float opFloat1(float opFloat1, Ice.Current current);
+
+            public abstract double opDouble1(double opDouble1, Ice.Current current);
+
+            public abstract string opString1(string opString1, Ice.Current current);
+
+            public abstract string[] opStringS1(string[] opStringS1, Ice.Current current);
 
             public abstract MyClassPrx? opMyClass(MyClassPrx? p1, out MyClassPrx? p2, out MyClassPrx? p3, Ice.Current current);
 
@@ -13502,83 +13530,55 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
 
-            public abstract global::System.Collections.Generic.Dictionary<long, float>[] opLongFloatDS(global::System.Collections.Generic.Dictionary<long, float>[] p1, global::System.Collections.Generic.Dictionary<long, float>[] p2, out global::System.Collections.Generic.Dictionary<long, float>[] p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<string, string>[] opStringStringDS(global::System.Collections.Generic.Dictionary<string, string>[] p1, global::System.Collections.Generic.Dictionary<string, string>[] p2, out global::System.Collections.Generic.Dictionary<string, string>[] p3, Ice.Current current);
-
             public abstract global::System.Collections.Generic.Dictionary<string, MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, MyEnum>[] p3, Ice.Current current);
 
-            public abstract global::System.Collections.Generic.Dictionary<MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<MyEnum, string>[] p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p1, global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<MyStruct, MyEnum>[] p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<byte, byte[]> opByteByteSD(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, out global::System.Collections.Generic.Dictionary<byte, byte[]> p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<bool, bool[]> opBoolBoolSD(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, out global::System.Collections.Generic.Dictionary<bool, bool[]> p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<int, int[]> opIntIntSD(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, out global::System.Collections.Generic.Dictionary<int, int[]> p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<long, long[]> opLongLongSD(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, out global::System.Collections.Generic.Dictionary<long, long[]> p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<string, float[]> opStringFloatSD(global::System.Collections.Generic.Dictionary<string, float[]> p1, global::System.Collections.Generic.Dictionary<string, float[]> p2, out global::System.Collections.Generic.Dictionary<string, float[]> p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<string, double[]> opStringDoubleSD(global::System.Collections.Generic.Dictionary<string, double[]> p1, global::System.Collections.Generic.Dictionary<string, double[]> p2, out global::System.Collections.Generic.Dictionary<string, double[]> p3, Ice.Current current);
-
-            public abstract global::System.Collections.Generic.Dictionary<string, string[]> opStringStringSD(global::System.Collections.Generic.Dictionary<string, string[]> p1, global::System.Collections.Generic.Dictionary<string, string[]> p2, out global::System.Collections.Generic.Dictionary<string, string[]> p3, Ice.Current current);
-
             public abstract global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p1, global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p2, out global::System.Collections.Generic.Dictionary<MyEnum, MyEnum[]> p3, Ice.Current current);
 
-            public abstract int[] opIntS(int[] s, Ice.Current current);
+            public abstract string[] opStringLiterals(Ice.Current current);
 
-            public abstract void opByteSOneway(byte[] s, Ice.Current current);
+            public abstract string[] opWStringLiterals(Ice.Current current);
 
-            public abstract int opByteSOnewayCallCount(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<string, string> opContext(Ice.Current current);
+            public abstract MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
 
-            public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current);
+            public abstract MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
 
-            public abstract void opIdempotent(Ice.Current current);
+            public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
-            public abstract byte opByte1(byte opByte1, 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 short opShort1(short opShort1, 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 int opInt1(int opInt1, Ice.Current current);
+            public abstract void shutdown(Ice.Current current);
 
-            public abstract long opLong1(long opLong1, Ice.Current current);
+            public abstract bool supportsCompress(Ice.Current current);
 
-            public abstract float opFloat1(float opFloat1, Ice.Current current);
+            public abstract void opVoid(Ice.Current current);
 
-            public abstract double opDouble1(double opDouble1, Ice.Current current);
+            public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
 
-            public abstract string opString1(string opString1, Ice.Current current);
+            public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
 
-            public abstract string[] opStringS1(string[] opStringS1, Ice.Current current);
+            public abstract global::System.Collections.Generic.Dictionary<string, double[]> opStringDoubleSD(global::System.Collections.Generic.Dictionary<string, double[]> p1, global::System.Collections.Generic.Dictionary<string, double[]> p2, out global::System.Collections.Generic.Dictionary<string, double[]> p3, Ice.Current current);
 
-            public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
+            public abstract global::System.Collections.Generic.Dictionary<string, string[]> opStringStringSD(global::System.Collections.Generic.Dictionary<string, string[]> p1, global::System.Collections.Generic.Dictionary<string, string[]> p2, out global::System.Collections.Generic.Dictionary<string, string[]> p3, Ice.Current current);
+
+            public abstract int[] opIntS(int[] s, 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 global::System.Collections.Generic.Dictionary<MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<MyEnum, string>[] p3, Ice.Current current);
 
-            public abstract MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
+            public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
 
             public override string ice_id(Ice.Current current) => ice_staticId();
 
@@ -13674,23 +13674,51 @@ namespace Test2
 {
     public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
     {
-        public abstract void shutdown(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 bool supportsCompress(Ice.Current current);
+        public abstract double opFloatDouble(float p1, double p2, out float p3, out double p4, Ice.Current current);
 
-        public abstract void opVoid(Ice.Current current);
+        public abstract string opString(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::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, Ice.Current current);
 
-        public abstract bool opBool(bool p1, bool p2, out bool 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 long opShortIntLong(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<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 double opFloatDouble(float p1, double p2, out float p3, out double p4, 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 opString(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::Ice.operations.Test.MyEnum opMyEnum(global::Ice.operations.Test.MyEnum p1, out global::Ice.operations.Test.MyEnum p2, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<long, long[]> opLongLongSD(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, out global::System.Collections.Generic.Dictionary<long, long[]> p3, Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, float[]> opStringFloatSD(global::System.Collections.Generic.Dictionary<string, float[]> p1, global::System.Collections.Generic.Dictionary<string, float[]> p2, out global::System.Collections.Generic.Dictionary<string, float[]> p3, Ice.Current current);
+
+        public abstract void opByteSOneway(byte[] s, Ice.Current current);
+
+        public abstract int opByteSOnewayCallCount(Ice.Current current);
+
+        public abstract global::System.Collections.Generic.Dictionary<string, string> opContext(Ice.Current current);
+
+        public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current);
+
+        public abstract void opIdempotent(Ice.Current current);
+
+        public abstract byte opByte1(byte opByte1, Ice.Current current);
+
+        public abstract short opShort1(short opShort1, Ice.Current current);
+
+        public abstract int opInt1(int opInt1, Ice.Current current);
+
+        public abstract long opLong1(long opLong1, Ice.Current current);
+
+        public abstract float opFloat1(float opFloat1, Ice.Current current);
+
+        public abstract double opDouble1(double opDouble1, Ice.Current current);
+
+        public abstract string opString1(string opString1, Ice.Current current);
+
+        public abstract string[] opStringS1(string[] opStringS1, Ice.Current current);
 
         public abstract global::Ice.operations.Test.MyClassPrx? opMyClass(global::Ice.operations.Test.MyClassPrx? p1, out global::Ice.operations.Test.MyClassPrx? p2, out global::Ice.operations.Test.MyClassPrx? p3, Ice.Current current);
 
@@ -13736,83 +13764,55 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
         public abstract global::System.Collections.Generic.Dictionary<short, int>[] opShortIntDS(global::System.Collections.Generic.Dictionary<short, int>[] p1, global::System.Collections.Generic.Dictionary<short, int>[] p2, out global::System.Collections.Generic.Dictionary<short, int>[] p3, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<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::Ice.operations.Test.MyEnum>[] opStringMyEnumDS(global::System.Collections.Generic.Dictionary<string, global::Ice.operations.Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<string, global::Ice.operations.Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<string, global::Ice.operations.Test.MyEnum>[] p3, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyStruct, global::Ice.operations.Test.MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyStruct, global::Ice.operations.Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyStruct, global::Ice.operations.Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyStruct, global::Ice.operations.Test.MyEnum>[] p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<byte, byte[]> opByteByteSD(global::System.Collections.Generic.Dictionary<byte, byte[]> p1, global::System.Collections.Generic.Dictionary<byte, byte[]> p2, out global::System.Collections.Generic.Dictionary<byte, byte[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<bool, bool[]> opBoolBoolSD(global::System.Collections.Generic.Dictionary<bool, bool[]> p1, global::System.Collections.Generic.Dictionary<bool, bool[]> p2, out global::System.Collections.Generic.Dictionary<bool, bool[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<short, short[]> opShortShortSD(global::System.Collections.Generic.Dictionary<short, short[]> p1, global::System.Collections.Generic.Dictionary<short, short[]> p2, out global::System.Collections.Generic.Dictionary<short, short[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<int, int[]> opIntIntSD(global::System.Collections.Generic.Dictionary<int, int[]> p1, global::System.Collections.Generic.Dictionary<int, int[]> p2, out global::System.Collections.Generic.Dictionary<int, int[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<long, long[]> opLongLongSD(global::System.Collections.Generic.Dictionary<long, long[]> p1, global::System.Collections.Generic.Dictionary<long, long[]> p2, out global::System.Collections.Generic.Dictionary<long, long[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, float[]> opStringFloatSD(global::System.Collections.Generic.Dictionary<string, float[]> p1, global::System.Collections.Generic.Dictionary<string, float[]> p2, out global::System.Collections.Generic.Dictionary<string, float[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, double[]> opStringDoubleSD(global::System.Collections.Generic.Dictionary<string, double[]> p1, global::System.Collections.Generic.Dictionary<string, double[]> p2, out global::System.Collections.Generic.Dictionary<string, double[]> p3, Ice.Current current);
-
-        public abstract global::System.Collections.Generic.Dictionary<string, string[]> opStringStringSD(global::System.Collections.Generic.Dictionary<string, string[]> p1, global::System.Collections.Generic.Dictionary<string, string[]> p2, out global::System.Collections.Generic.Dictionary<string, string[]> p3, Ice.Current current);
-
         public abstract global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, global::Ice.operations.Test.MyEnum[]> opMyEnumMyEnumSD(global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, global::Ice.operations.Test.MyEnum[]> p1, global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, global::Ice.operations.Test.MyEnum[]> p2, out global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, global::Ice.operations.Test.MyEnum[]> p3, Ice.Current current);
 
-        public abstract int[] opIntS(int[] s, Ice.Current current);
+        public abstract string[] opStringLiterals(Ice.Current current);
 
-        public abstract void opByteSOneway(byte[] s, Ice.Current current);
+        public abstract string[] opWStringLiterals(Ice.Current current);
 
-        public abstract int opByteSOnewayCallCount(Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyStruct, global::Ice.operations.Test.MyEnum>[] opMyStructMyEnumDS(global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyStruct, global::Ice.operations.Test.MyEnum>[] p1, global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyStruct, global::Ice.operations.Test.MyEnum>[] p2, out global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyStruct, global::Ice.operations.Test.MyEnum>[] p3, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<string, string> opContext(Ice.Current current);
+        public abstract global::Ice.operations.Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
 
-        public abstract void opDoubleMarshaling(double p1, double[] p2, Ice.Current current);
+        public abstract global::Ice.operations.Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
 
-        public abstract void opIdempotent(Ice.Current current);
+        public abstract global::Ice.operations.Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
 
-        public abstract byte opByte1(byte opByte1, 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 short opShort1(short opShort1, 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 int opInt1(int opInt1, Ice.Current current);
+        public abstract void shutdown(Ice.Current current);
 
-        public abstract long opLong1(long opLong1, Ice.Current current);
+        public abstract bool supportsCompress(Ice.Current current);
 
-        public abstract float opFloat1(float opFloat1, Ice.Current current);
+        public abstract void opVoid(Ice.Current current);
 
-        public abstract double opDouble1(double opDouble1, Ice.Current current);
+        public abstract byte opByte(byte p1, byte p2, out byte p3, Ice.Current current);
 
-        public abstract string opString1(string opString1, Ice.Current current);
+        public abstract bool opBool(bool p1, bool p2, out bool p3, Ice.Current current);
 
-        public abstract string[] opStringS1(string[] opStringS1, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<string, double[]> opStringDoubleSD(global::System.Collections.Generic.Dictionary<string, double[]> p1, global::System.Collections.Generic.Dictionary<string, double[]> p2, out global::System.Collections.Generic.Dictionary<string, double[]> p3, Ice.Current current);
 
-        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<string, string[]> opStringStringSD(global::System.Collections.Generic.Dictionary<string, string[]> p1, global::System.Collections.Generic.Dictionary<string, string[]> p2, out global::System.Collections.Generic.Dictionary<string, string[]> p3, Ice.Current current);
+
+        public abstract int[] opIntS(int[] s, Ice.Current current);
 
         public abstract string[] opStringS2(string[] stringS, Ice.Current current);
 
         public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD2(global::System.Collections.Generic.Dictionary<byte, bool> byteBoolD, Ice.Current current);
 
-        public abstract string[] opStringLiterals(Ice.Current current);
-
-        public abstract string[] opWStringLiterals(Ice.Current current);
-
         public abstract global::Ice.operations.Test.MyClass_OpMStruct1MarshaledResult opMStruct1(Ice.Current current);
 
         public abstract global::Ice.operations.Test.MyClass_OpMStruct2MarshaledResult opMStruct2(global::Ice.operations.Test.Structure p1, Ice.Current current);
 
         public abstract global::Ice.operations.Test.MyClass_OpMSeq1MarshaledResult opMSeq1(Ice.Current current);
 
-        public abstract global::Ice.operations.Test.MyClass_OpMSeq2MarshaledResult opMSeq2(string[] p1, Ice.Current current);
-
-        public abstract global::Ice.operations.Test.MyClass_OpMDict1MarshaledResult opMDict1(Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] opMyEnumStringDS(global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] p1, global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] p2, out global::System.Collections.Generic.Dictionary<global::Ice.operations.Test.MyEnum, string>[] p3, Ice.Current current);
 
-        public abstract global::Ice.operations.Test.MyClass_OpMDict2MarshaledResult opMDict2(global::System.Collections.Generic.Dictionary<string, string> p1, Ice.Current current);
+        public abstract global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1(global::System.Collections.Generic.Dictionary<byte, bool> opByteBoolD1, Ice.Current current);
 
         public override string ice_id(Ice.Current current) => ice_staticId();
 
diff --git a/slice2cs/csharp/test/Ice/operations/TestAMD.cs b/slice2cs/csharp/test/Ice/operations/TestAMD.cs
index 17df5d7cd722..d2aee4a20cb2 100644
--- a/slice2cs/csharp/test/Ice/operations/TestAMD.cs
+++ b/slice2cs/csharp/test/Ice/operations/TestAMD.cs
@@ -9868,8 +9868,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 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);
@@ -9880,6 +9878,8 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongResult> opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current);
 
+            public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
+
             public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleResult> opFloatDoubleAsync(float p1, double p2, Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpStringResult> opStringAsync(string p1, string p2, Ice.Current current);
@@ -9892,10 +9892,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSResult> opByteSAsync(byte[] p1, byte[] p2, Ice.Current current);
 
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSResult> opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current);
-
             public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleSResult> opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpStringSResult> opStringSAsync(string[] p1, string[] p2, Ice.Current current);
@@ -9914,6 +9910,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpByteBoolDResult> opByteBoolDAsync(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, Ice.Current current);
 
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSResult> opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current);
+
             public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntDResult> opShortIntDAsync(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpLongFloatDResult> opLongFloatDAsync(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, Ice.Current current);
diff --git a/slice2cs/ruby/test/Ice/location/Test.cs b/slice2cs/ruby/test/Ice/location/Test.cs
index d68efdfb14f5..11a8a9e76a88 100644
--- a/slice2cs/ruby/test/Ice/location/Test.cs
+++ b/slice2cs/ruby/test/Ice/location/Test.cs
@@ -186,11 +186,11 @@ private void _iceI_setAdapterDirectProxy(string iceP_id, global::Ice.ObjectPrx?
                     {
                         throw ex;
                     }
-                    catch(global::Ice.AdapterNotFoundException)
+                    catch(global::Ice.AdapterAlreadyActiveException)
                     {
                         throw;
                     }
-                    catch(global::Ice.AdapterAlreadyActiveException)
+                    catch(global::Ice.AdapterNotFoundException)
                     {
                         throw;
                     }
@@ -236,15 +236,15 @@ private void _iceI_setReplicatedAdapterDirectProxy(string iceP_adapterId, string
                     {
                         throw ex;
                     }
-                    catch(global::Ice.AdapterNotFoundException)
+                    catch(global::Ice.InvalidReplicaGroupIdException)
                     {
                         throw;
                     }
-                    catch(global::Ice.InvalidReplicaGroupIdException)
+                    catch(global::Ice.AdapterAlreadyActiveException)
                     {
                         throw;
                     }
-                    catch(global::Ice.AdapterAlreadyActiveException)
+                    catch(global::Ice.AdapterNotFoundException)
                     {
                         throw;
                     }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java
index 6200ad1a0922..ecbd9065b933 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java
@@ -224,5 +224,5 @@ static public java.util.Optional<DataSample> ice_read(com.zeroc.Ice.InputStream
     private static final DataSample _nullMarshalValue = new DataSample();
 
     /** @hidden */
-    private static final long serialVersionUID = -3854205128378894290L;
+    private static final long serialVersionUID = -2004457903365208066L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java
index 8dd778ab4b98..0f9a0bd344c4 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java
@@ -155,5 +155,5 @@ static public java.util.Optional<DataSamples> ice_read(com.zeroc.Ice.InputStream
     private static final DataSamples _nullMarshalValue = new DataSamples();
 
     /** @hidden */
-    private static final long serialVersionUID = 6504729579673878850L;
+    private static final long serialVersionUID = -5577050915105203878L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java
index 0d84af634963..22ac302815ab 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java
@@ -424,7 +424,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1007314616368865575L;
+    private static final long serialVersionUID = -3961881929226884986L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java
index 288a85f4e8d9..d0d40c9e86ef 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java
@@ -174,5 +174,5 @@ static public java.util.Optional<ElementData> ice_read(com.zeroc.Ice.InputStream
     private static final ElementData _nullMarshalValue = new ElementData();
 
     /** @hidden */
-    private static final long serialVersionUID = -7032850603547709120L;
+    private static final long serialVersionUID = 7859619215011069752L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java
index 3ebfbfb7d797..e03718ecb510 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java
@@ -200,5 +200,5 @@ static public java.util.Optional<ElementDataAck> ice_read(com.zeroc.Ice.InputStr
     private static final ElementDataAck _nullMarshalValue = new ElementDataAck();
 
     /** @hidden */
-    private static final long serialVersionUID = -608761365238775150L;
+    private static final long serialVersionUID = 5108687161682778226L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java
index cb965eee213f..078497aec977 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java
@@ -172,5 +172,5 @@ static public java.util.Optional<ElementInfo> ice_read(com.zeroc.Ice.InputStream
     private static final ElementInfo _nullMarshalValue = new ElementInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -1334633603099133797L;
+    private static final long serialVersionUID = -354161950524300988L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java
index daf99c00d993..873b13b5bc4a 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java
@@ -215,5 +215,5 @@ static public java.util.Optional<ElementSpec> ice_read(com.zeroc.Ice.InputStream
     private static final ElementSpec _nullMarshalValue = new ElementSpec();
 
     /** @hidden */
-    private static final long serialVersionUID = 487758564537088837L;
+    private static final long serialVersionUID = 2746108234682905028L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java
index 7fd7fed38c5d..ab03b1668dce 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java
@@ -215,5 +215,5 @@ static public java.util.Optional<ElementSpecAck> ice_read(com.zeroc.Ice.InputStr
     private static final ElementSpecAck _nullMarshalValue = new ElementSpecAck();
 
     /** @hidden */
-    private static final long serialVersionUID = 3298933484699220450L;
+    private static final long serialVersionUID = -2802720719193131830L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java
index b7ef77392c2d..92521c930ce8 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java
@@ -153,5 +153,5 @@ static public java.util.Optional<FilterInfo> ice_read(com.zeroc.Ice.InputStream
     private static final FilterInfo _nullMarshalValue = new FilterInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 8439153463340740721L;
+    private static final long serialVersionUID = 6499178522850816502L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java
index 9da30caa4cfb..bee663913eea 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java
@@ -159,5 +159,5 @@ static public java.util.Optional<TopicInfo> ice_read(com.zeroc.Ice.InputStream i
     private static final TopicInfo _nullMarshalValue = new TopicInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 4765745913460292553L;
+    private static final long serialVersionUID = 7889463203428758612L;
 }
diff --git a/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java b/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java
index fbfe6046d3da..4a75a71b50e4 100644
--- a/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java
+++ b/slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java
@@ -185,5 +185,5 @@ static public java.util.Optional<TopicSpec> ice_read(com.zeroc.Ice.InputStream i
     private static final TopicSpec _nullMarshalValue = new TopicSpec();
 
     /** @hidden */
-    private static final long serialVersionUID = 7661661071305565482L;
+    private static final long serialVersionUID = -186128168391674319L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java
index fd5d8fb3561f..0f6bf56bd24f 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3774318559021832087L;
+    private static final long serialVersionUID = 3774317193927409948L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java
index 6f3352bab85d..32e8baef6559 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7872705026037153721L;
+    private static final long serialVersionUID = 7872703495623158625L;
 }
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java
index 3687dc0585c4..3a27dc10e907 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 = 3089755251539852513L;
+    private static final long serialVersionUID = 594022330285831986L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java
index 45b1ec2b19f6..2d3d9edda059 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 = -588389060271070406L;
+    private static final long serialVersionUID = -5063840936401403627L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
index 6d786e171d2c..82d002251209 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java
@@ -196,7 +196,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1983583943317208782L;
+    private static final long serialVersionUID = 3247686098562578888L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistry.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistry.java
index 1bd2fbaa766e..8bfa4e21dedb 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistry.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistry.java
@@ -134,8 +134,8 @@ public void read(com.zeroc.Ice.InputStream istr)
      * @throws NodeActiveException Raised if the node is already registered and currently active.
      **/
     NodeSessionPrx registerNode(InternalNodeInfo info, NodePrx prx, com.zeroc.IceGrid.LoadInfo loadInf, com.zeroc.Ice.Current current)
-        throws NodeActiveException,
-               com.zeroc.IceGrid.PermissionDeniedException;
+        throws com.zeroc.IceGrid.PermissionDeniedException,
+               NodeActiveException;
 
     /**
      * Register a replica with the registry. If a replica with the same name is already registered,
@@ -148,8 +148,8 @@ NodeSessionPrx registerNode(InternalNodeInfo info, NodePrx prx, com.zeroc.IceGri
      * @throws ReplicaActiveException Raised if the replica is already registered and currently active.
      **/
     ReplicaSessionPrx registerReplica(InternalReplicaInfo info, InternalRegistryPrx prx, com.zeroc.Ice.Current current)
-        throws ReplicaActiveException,
-               com.zeroc.IceGrid.PermissionDeniedException;
+        throws com.zeroc.IceGrid.PermissionDeniedException,
+               ReplicaActiveException;
 
     /**
      * Create a session with the given registry replica. This method returns only once the session creation has been
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistryPrx.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistryPrx.java
index fdcee4f77430..ad2dd1031b8c 100644
--- a/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistryPrx.java
+++ b/slice2java/cpp/src/IceGrid/IceGrid/InternalRegistryPrx.java
@@ -28,8 +28,8 @@ public interface InternalRegistryPrx extends FileReaderPrx
      * @throws NodeActiveException Raised if the node is already registered and currently active.
      **/
     default NodeSessionPrx registerNode(InternalNodeInfo info, NodePrx prx, com.zeroc.IceGrid.LoadInfo loadInf)
-        throws NodeActiveException,
-               com.zeroc.IceGrid.PermissionDeniedException
+        throws com.zeroc.IceGrid.PermissionDeniedException,
+               NodeActiveException
     {
         return registerNode(info, prx, loadInf, com.zeroc.Ice.ObjectPrx.noExplicitContext);
     }
@@ -46,18 +46,18 @@ default NodeSessionPrx registerNode(InternalNodeInfo info, NodePrx prx, com.zero
      * @throws NodeActiveException Raised if the node is already registered and currently active.
      **/
     default NodeSessionPrx registerNode(InternalNodeInfo info, NodePrx prx, com.zeroc.IceGrid.LoadInfo loadInf, java.util.Map<String, String> context)
-        throws NodeActiveException,
-               com.zeroc.IceGrid.PermissionDeniedException
+        throws com.zeroc.IceGrid.PermissionDeniedException,
+               NodeActiveException
     {
         try
         {
             return _iceI_registerNodeAsync(info, prx, loadInf, context, true).waitForResponseOrUserEx();
         }
-        catch(NodeActiveException ex)
+        catch(com.zeroc.IceGrid.PermissionDeniedException ex)
         {
             throw ex;
         }
-        catch(com.zeroc.IceGrid.PermissionDeniedException ex)
+        catch(NodeActiveException ex)
         {
             throw ex;
         }
@@ -124,8 +124,8 @@ default com.zeroc.Ice.OutgoingAsync<NodeSessionPrx> _iceI_registerNodeAsync(Inte
     /** @hidden */
     static final Class<?>[] _iceE_registerNode =
     {
-        NodeActiveException.class,
-        com.zeroc.IceGrid.PermissionDeniedException.class
+        com.zeroc.IceGrid.PermissionDeniedException.class,
+        NodeActiveException.class
     };
 
     /**
@@ -138,8 +138,8 @@ default com.zeroc.Ice.OutgoingAsync<NodeSessionPrx> _iceI_registerNodeAsync(Inte
      * @throws ReplicaActiveException Raised if the replica is already registered and currently active.
      **/
     default ReplicaSessionPrx registerReplica(InternalReplicaInfo info, InternalRegistryPrx prx)
-        throws ReplicaActiveException,
-               com.zeroc.IceGrid.PermissionDeniedException
+        throws com.zeroc.IceGrid.PermissionDeniedException,
+               ReplicaActiveException
     {
         return registerReplica(info, prx, com.zeroc.Ice.ObjectPrx.noExplicitContext);
     }
@@ -155,18 +155,18 @@ default ReplicaSessionPrx registerReplica(InternalReplicaInfo info, InternalRegi
      * @throws ReplicaActiveException Raised if the replica is already registered and currently active.
      **/
     default ReplicaSessionPrx registerReplica(InternalReplicaInfo info, InternalRegistryPrx prx, java.util.Map<String, String> context)
-        throws ReplicaActiveException,
-               com.zeroc.IceGrid.PermissionDeniedException
+        throws com.zeroc.IceGrid.PermissionDeniedException,
+               ReplicaActiveException
     {
         try
         {
             return _iceI_registerReplicaAsync(info, prx, context, true).waitForResponseOrUserEx();
         }
-        catch(ReplicaActiveException ex)
+        catch(com.zeroc.IceGrid.PermissionDeniedException ex)
         {
             throw ex;
         }
-        catch(com.zeroc.IceGrid.PermissionDeniedException ex)
+        catch(ReplicaActiveException ex)
         {
             throw ex;
         }
@@ -229,8 +229,8 @@ default com.zeroc.Ice.OutgoingAsync<ReplicaSessionPrx> _iceI_registerReplicaAsyn
     /** @hidden */
     static final Class<?>[] _iceE_registerReplica =
     {
-        ReplicaActiveException.class,
-        com.zeroc.IceGrid.PermissionDeniedException.class
+        com.zeroc.IceGrid.PermissionDeniedException.class,
+        ReplicaActiveException.class
     };
 
     /**
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java
index 55d9e22e8460..1b94d425d5f5 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 = 8321714214446798844L;
+    private static final long serialVersionUID = 8944127105771955516L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java b/slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java
index b273a1c91d8c..a95c0587d783 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 = -810758606242429003L;
+    private static final long serialVersionUID = 4445893790968470316L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/AllData.java b/slice2java/cpp/src/IceStorm/IceStorm/AllData.java
index d0b2c4eb356d..6dda15983459 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 = 8843413188422354199L;
+    private static final long serialVersionUID = -1960902246241915721L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/EventData.java b/slice2java/cpp/src/IceStorm/IceStorm/EventData.java
index f824d8200a45..7bf988ec2b06 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 = 2795677325872734613L;
+    private static final long serialVersionUID = 4291816882296087093L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java
index 55e724b0ddcc..111d35ecbb9f 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 = -5832037413412525200L;
+    private static final long serialVersionUID = -3302313479959552548L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java
index 2155ddd7cfa5..3d22506fc3ca 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 = -3788111755790525791L;
+    private static final long serialVersionUID = -870393169378783758L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java b/slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java
index 80c228e4147d..2fb0eeac769a 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 = 7007905833708671967L;
+    private static final long serialVersionUID = 8998566020199341343L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java
index 13cd95406ba2..426a10d38e1a 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 = -6339574014037429013L;
+    private static final long serialVersionUID = -1225569543259094081L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java b/slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java
index eb1448de8c9d..4fd8200f00ea 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 = 2092051604432705092L;
+    private static final long serialVersionUID = 705809845220870852L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java
index 8b348f3dd15f..d6c1d577cf25 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 = 1811749102438024603L;
+    private static final long serialVersionUID = 3454075547213801340L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java
index 632f4ed18935..350b3509a817 100644
--- a/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java
+++ b/slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 938913599948109891L;
+    private static final long serialVersionUID = 938916114210354718L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java b/slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java
index 2adc28fa0dc7..b5b8f9809c1a 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 = 6549209742269524111L;
+    private static final long serialVersionUID = 4151879864620266410L;
 }
diff --git a/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java b/slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java
index 3f16b06e10c2..20f469f0c6eb 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 = 4629810886156625951L;
+    private static final long serialVersionUID = -6534840054319342651L;
 }
diff --git a/slice2java/cpp/src/icegriddb/IceGrid/AllData.java b/slice2java/cpp/src/icegriddb/IceGrid/AllData.java
index e6fd954d3220..5847e2b12d9b 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 = 4156293738610003092L;
+    private static final long serialVersionUID = -2318219210785017412L;
 }
diff --git a/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java b/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java
index da82a48dbc96..db0a409f7850 100644
--- a/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java
+++ b/slice2java/cpp/test/DataStorm/api/Test/ClassKey.java
@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1632392606067947304L;
+    private static final long serialVersionUID = 1632402483383028763L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/api/Test/StructKey.java b/slice2java/cpp/test/DataStorm/api/Test/StructKey.java
index 812a980075f7..dee580553e6a 100644
--- a/slice2java/cpp/test/DataStorm/api/Test/StructKey.java
+++ b/slice2java/cpp/test/DataStorm/api/Test/StructKey.java
@@ -138,5 +138,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = -8144787195700148104L;
+    private static final long serialVersionUID = -8144777649000760117L;
 }
diff --git a/slice2java/cpp/test/DataStorm/events/Test/Base.java b/slice2java/cpp/test/DataStorm/events/Test/Base.java
index c034de5d5a89..7f1e5d1fd92d 100644
--- a/slice2java/cpp/test/DataStorm/events/Test/Base.java
+++ b/slice2java/cpp/test/DataStorm/events/Test/Base.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2623901784032855946L;
+    private static final long serialVersionUID = -2623895007626172672L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/events/Test/Extended.java b/slice2java/cpp/test/DataStorm/events/Test/Extended.java
index cea0c6bdf4d2..c3783dfc8f93 100644
--- a/slice2java/cpp/test/DataStorm/events/Test/Extended.java
+++ b/slice2java/cpp/test/DataStorm/events/Test/Extended.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2516993716297520521L;
+    private static final long serialVersionUID = 2516995037543873905L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/events/Test/StructValue.java b/slice2java/cpp/test/DataStorm/events/Test/StructValue.java
index 4ff9d7cbc512..082754d74ba3 100644
--- a/slice2java/cpp/test/DataStorm/events/Test/StructValue.java
+++ b/slice2java/cpp/test/DataStorm/events/Test/StructValue.java
@@ -167,5 +167,5 @@ static public java.util.Optional<StructValue> ice_read(com.zeroc.Ice.InputStream
     private static final StructValue _nullMarshalValue = new StructValue();
 
     /** @hidden */
-    private static final long serialVersionUID = -2598418802138065554L;
+    private static final long serialVersionUID = -7938866659900310890L;
 }
diff --git a/slice2java/cpp/test/DataStorm/partial/Test/Stock.java b/slice2java/cpp/test/DataStorm/partial/Test/Stock.java
index 4a01d69f6c66..cca53dbb1d69 100644
--- a/slice2java/cpp/test/DataStorm/partial/Test/Stock.java
+++ b/slice2java/cpp/test/DataStorm/partial/Test/Stock.java
@@ -158,5 +158,5 @@ static public java.util.Optional<Stock> ice_read(com.zeroc.Ice.InputStream istr,
     private static final Stock _nullMarshalValue = new Stock();
 
     /** @hidden */
-    private static final long serialVersionUID = 3182539407095001850L;
+    private static final long serialVersionUID = 6456142992605850957L;
 }
diff --git a/slice2java/cpp/test/DataStorm/types/Test/Base.java b/slice2java/cpp/test/DataStorm/types/Test/Base.java
index 20c600b7f80a..f7b2e79c2e9f 100644
--- a/slice2java/cpp/test/DataStorm/types/Test/Base.java
+++ b/slice2java/cpp/test/DataStorm/types/Test/Base.java
@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2623899691695569862L;
+    private static final long serialVersionUID = -2623898937470949237L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/types/Test/Extended.java b/slice2java/cpp/test/DataStorm/types/Test/Extended.java
index 2e520bec2f81..691107c536c1 100644
--- a/slice2java/cpp/test/DataStorm/types/Test/Extended.java
+++ b/slice2java/cpp/test/DataStorm/types/Test/Extended.java
@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2516991642188522489L;
+    private static final long serialVersionUID = 2516990947544945732L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/DataStorm/types/Test/StructValue.java b/slice2java/cpp/test/DataStorm/types/Test/StructValue.java
index 968b477b942e..a179df9bcc48 100644
--- a/slice2java/cpp/test/DataStorm/types/Test/StructValue.java
+++ b/slice2java/cpp/test/DataStorm/types/Test/StructValue.java
@@ -167,5 +167,5 @@ static public java.util.Optional<StructValue> ice_read(com.zeroc.Ice.InputStream
     private static final StructValue _nullMarshalValue = new StructValue();
 
     /** @hidden */
-    private static final long serialVersionUID = -8165018300005456354L;
+    private static final long serialVersionUID = 1277554335509060131L;
 }
diff --git a/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java b/slice2java/cpp/test/Glacier2/dynamicFiltering/Test/TestToken.java
index 196a0bcb2d5c..2f9c7e883408 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 = -6138457258562987718L;
+    private static final long serialVersionUID = -7113285077354725318L;
 }
diff --git a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java
index 823c9ae30486..d7c3842710b5 100644
--- a/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/cpp/test/Glacier2/router/Test/CallbackException.java
@@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6539734263596941238L;
+    private static final long serialVersionUID = -5875601445074476142L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java b/slice2java/cpp/test/Ice/custom/Test/BufferStruct.java
index 62ff1019f19c..ea41bb51e105 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 = -155285849523638266L;
+    private static final long serialVersionUID = 1702549458895711553L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/DictClass.java b/slice2java/cpp/test/Ice/custom/Test/DictClass.java
index d0433906f2e5..b13d630be7ca 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 = 6545913815152597742L;
+    private static final long serialVersionUID = 6545927074509692489L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/custom/Test/Fixed.java b/slice2java/cpp/test/Ice/custom/Test/Fixed.java
index 43647a3fb6f7..c6299372faa8 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 = -5072327952654098402L;
+    private static final long serialVersionUID = -5072321801311308039L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test/Variable.java b/slice2java/cpp/test/Ice/custom/Test/Variable.java
index ff4f5973e546..931f50060e6d 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 = 6037138845921419535L;
+    private static final long serialVersionUID = 8324316161430085480L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java
index f73f7f9f0de2..565b1b586969 100644
--- a/slice2java/cpp/test/Ice/custom/Test1/WstringException.java
+++ b/slice2java/cpp/test/Ice/custom/Test1/WstringException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1345710869459967314L;
+    private static final long serialVersionUID = 1345710002806775363L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test1/WstringStruct.java
index 52bd633b7c0f..ccbd13cba1fa 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 = -6616023367780712827L;
+    private static final long serialVersionUID = -6616022666587218796L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java
index 2a5d16b634d2..0fd7122112c2 100644
--- a/slice2java/cpp/test/Ice/custom/Test2/WstringException.java
+++ b/slice2java/cpp/test/Ice/custom/Test2/WstringException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4583043715332470481L;
+    private static final long serialVersionUID = 4583029208199268160L;
 }
diff --git a/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java b/slice2java/cpp/test/Ice/custom/Test2/WstringStruct.java
index 3b366bcb0a34..14144bea8c58 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 = 5997321185314520966L;
+    private static final long serialVersionUID = 5997335526988025367L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Base.java b/slice2java/cpp/test/Ice/defaultValue/Test/Base.java
index 293847bf6c7b..9ce67c598546 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 = -222114205147295828L;
+    private static final long serialVersionUID = 499791073959136366L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java
index 12f80c8cd877..224c9dd0bcdc 100644
--- a/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/cpp/test/Ice/defaultValue/Test/BaseEx.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6075717076938744744L;
+    private static final long serialVersionUID = -2121998201184908518L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java b/slice2java/cpp/test/Ice/defaultValue/Test/Derived.java
index 64f74ccfe548..69f9be4feeb4 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 = 4086167033488502668L;
+    private static final long serialVersionUID = 2276517241687105805L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java
index c05b20a49901..418168e59a5c 100644
--- a/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/cpp/test/Ice/defaultValue/Test/DerivedEx.java
@@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4927788367958723397L;
+    private static final long serialVersionUID = 2479490779871210682L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct1.java
index 4e6b66f500f9..8d4d03298033 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 = -5900364945772112672L;
+    private static final long serialVersionUID = 6944359249905846147L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct2.java
index f944c07ab881..de48cc0f6cdc 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 = 4786426568047528322L;
+    private static final long serialVersionUID = 5159600131504248030L;
 }
diff --git a/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/cpp/test/Ice/defaultValue/Test/Struct3.java
index 664d968762ad..2aacbb550f7f 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 = -1565498378216728094L;
+    private static final long serialVersionUID = -6071103852739507199L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/A.java b/slice2java/cpp/test/Ice/exceptions/Test/A.java
index 0f5fd01b7c91..a5dfb49299bd 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/A.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823746709257507734L;
+    private static final long serialVersionUID = 7823738686664997224L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/B.java b/slice2java/cpp/test/Ice/exceptions/Test/B.java
index 00992974d704..1c66177d7fdd 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/B.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861409189254507690L;
+    private static final long serialVersionUID = -3861417211851618392L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/C.java b/slice2java/cpp/test/Ice/exceptions/Test/C.java
index 09c28391ba68..0415eec84509 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/C.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080700400460293014L;
+    private static final long serialVersionUID = 1080692377867782504L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/D.java b/slice2java/cpp/test/Ice/exceptions/Test/D.java
index fcff3bab6642..2fad8e76c12a 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/D.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780383078847570518L;
+    private static final long serialVersionUID = 4780375056250459816L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/E.java b/slice2java/cpp/test/Ice/exceptions/Test/E.java
index c09a9d198dbb..df2844616132 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/E.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/E.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1876972118270756274L;
+    private static final long serialVersionUID = -1876980140859758785L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/F.java b/slice2java/cpp/test/Ice/exceptions/Test/F.java
index 92db63de0aea..e4b4b1292c02 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/F.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/F.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 733479458960634573L;
+    private static final long serialVersionUID = 733476891536726268L;
 }
diff --git a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java
index edd97d9aea13..9cd089aeb41a 100644
--- a/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/cpp/test/Ice/exceptions/Test/Mod/A.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641412156097542142L;
+    private static final long serialVersionUID = -4641409588672763908L;
 }
diff --git a/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java b/slice2java/cpp/test/Ice/inheritance/Test/MC/A.java
index 8387de28b96e..cfa0bdd4ce99 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 = 954232032390975135L;
+    private static final long serialVersionUID = 954229733617722477L;
 
     /** @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 d6887b8e8c2e..6fb84142b711 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 = 1339641195971127941L;
+    private static final long serialVersionUID = 1339633320713759991L;
 
     /** @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 2691dd70c0f9..753b47e70982 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 = -2729304540476521977L;
+    private static final long serialVersionUID = -2729306800426281995L;
 
     /** @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 f9d9577b4958..5dc13e7ff23a 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 = -3435401573656302207L;
+    private static final long serialVersionUID = -3435398858885811725L;
 
     /** @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 b874a2a8cd36..4751827c3704 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 = -836183747943353192L;
+    private static final long serialVersionUID = -836181157373332438L;
 
     /** @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 27aa2e902c1d..c6a6cec8dd0d 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 = 1132530158922751013L;
+    private static final long serialVersionUID = 1132522118063361559L;
 
     /** @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 311dcbe7d22f..70d0a5244d6f 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 = -6335553217669666137L;
+    private static final long serialVersionUID = -6335555643230647531L;
 
     /** @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 84a9a9b1f096..57c0c668c4bc 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 = -4007413114323218911L;
+    private static final long serialVersionUID = -4007410565154749933L;
 
     /** @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 093cbe21ffbc..dfeae709632b 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 = 991426020494205465L;
+    private static final long serialVersionUID = 991428696441203307L;
 
     /** @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 ce9bce61dc75..483a067cb362 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 = -2880326750858683707L;
+    private static final long serialVersionUID = -2880334791419212617L;
 
     /** @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 756ad51a1794..07cdc2139a12 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 = -8808265702690557113L;
+    private static final long serialVersionUID = -8808268127952677963L;
 
     /** @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 d733cc77eae4..a02ebed922b3 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 = -771856319928668479L;
+    private static final long serialVersionUID = -771853770461338957L;
 
     /** @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 d96e6cc86277..32fcf08b8cc2 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 = 6566346523061427226L;
+    private static final long serialVersionUID = 6566354728929856040L;
 
     /** @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 08da0bbdea7a..da249fc8c670 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 = 6983807073752107365L;
+    private static final long serialVersionUID = 6983798867883674327L;
 
     /** @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 3d60e5c62021..4f1ecd4fa2ff 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 = -1175217397213201433L;
+    private static final long serialVersionUID = -1175219987774026539L;
 
     /** @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 7af7df7595fd..065c6b9ac35e 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 = -3279721412510839199L;
+    private static final long serialVersionUID = -3279719028351413805L;
 
     /** @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 4bc7c6f84c6e..f125284cef60 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 = -4359179968029472869L;
+    private static final long serialVersionUID = -4359171676774867095L;
 
     /** @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 3fa179497c3e..79ab19290549 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 = 5904697983522515973L;
+    private static final long serialVersionUID = 5904690108265148023L;
 
     /** @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 29b2a1a15a95..dbb24227f5a3 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 = 1835752247074866055L;
+    private static final long serialVersionUID = 1835749987125106037L;
 
     /** @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 e0b03569a227..13a742147ae8 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 = -2252402226886619391L;
+    private static final long serialVersionUID = -2252399512116128909L;
 
     /** @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 27a343a4d8bc..dee7ea2e9aa9 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 = -1203531590569454188L;
+    private static final long serialVersionUID = -1203539590027291866L;
 
     /** @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 1c98ff50d375..ed7f4a9758e2 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 = -7537761872664534107L;
+    private static final long serialVersionUID = -7537769913523923561L;
 
     /** @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 ca2d76114710..5a8d5f6bc03e 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 = 3440898824452600359L;
+    private static final long serialVersionUID = 3440896398891618965L;
 
     /** @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 e3c480575e63..29c3de09abf6 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 = 9151096368580752801L;
+    private static final long serialVersionUID = 9151098917749221779L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/library/Test/UserError.java b/slice2java/cpp/test/Ice/library/Test/UserError.java
index 59aee5a52105..c76e91fcf6c8 100644
--- a/slice2java/cpp/test/Ice/library/Test/UserError.java
+++ b/slice2java/cpp/test/Ice/library/Test/UserError.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126956848955146288L;
+    private static final long serialVersionUID = -1126955889156992712L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/A.java b/slice2java/cpp/test/Ice/objects/Test/A.java
index 5e65b96d5f8f..f727245288d4 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 = 53403730958175011L;
+    private static final long serialVersionUID = -4004678942688198301L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/A1.java b/slice2java/cpp/test/Ice/objects/Test/A1.java
index fc1911fa794f..bf0370d6f58a 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 = -5926743954781699230L;
+    private static final long serialVersionUID = -5926748570485659228L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/B.java b/slice2java/cpp/test/Ice/objects/Test/B.java
index c5b21a5ec114..ccc7e9c2fcdb 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 = -8890915119267907862L;
+    private static final long serialVersionUID = -8890916124025341483L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/B1.java b/slice2java/cpp/test/Ice/objects/Test/B1.java
index c30b7e13896f..e36bdfa7234b 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 = -7516512084241622076L;
+    private static final long serialVersionUID = -2085419797803805372L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Base.java b/slice2java/cpp/test/Ice/objects/Test/Base.java
index c302739783bd..92ac8c19d656 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 = -2544360575372185211L;
+    private static final long serialVersionUID = -3661893028095354480L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java
index 6d508c0c6fd1..f1da11def075 100644
--- a/slice2java/cpp/test/Ice/objects/Test/BaseEx.java
+++ b/slice2java/cpp/test/Ice/objects/Test/BaseEx.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3897766785979964080L;
+    private static final long serialVersionUID = 3897766628422326902L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/C.java b/slice2java/cpp/test/Ice/objects/Test/C.java
index a5866d283ded..f30718ca3db5 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 = 1875167013544989802L;
+    private static final long serialVersionUID = 5744684228521680771L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/COneMember.java b/slice2java/cpp/test/Ice/objects/Test/COneMember.java
index c710fb2188cc..4df4e5d44a9d 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 = 3050979430515902802L;
+    private static final long serialVersionUID = 3050974814652836313L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/CTwoMembers.java
index 050f85e05ee1..f9fa946641a6 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 = -8067336465360823141L;
+    private static final long serialVersionUID = -5741341652889954213L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/D.java b/slice2java/cpp/test/Ice/objects/Test/D.java
index 3f0980c1985f..2b87910f4ef5 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 = -7595679271674301843L;
+    private static final long serialVersionUID = -6682931823846802830L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/D1.java b/slice2java/cpp/test/Ice/objects/Test/D1.java
index befff0be60fe..ab0e458537b7 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 = -863157144867715965L;
+    private static final long serialVersionUID = -1487127852659802237L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Derived.java b/slice2java/cpp/test/Ice/objects/Test/Derived.java
index ffa00ff4598f..4b8c950116ca 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 = -1587932010987797774L;
+    private static final long serialVersionUID = -1587930608458132250L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/E.java b/slice2java/cpp/test/Ice/objects/Test/E.java
index aa174fccbbb2..5acc97134ca9 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 = -6219302388050455681L;
+    private static final long serialVersionUID = -6703884720654400193L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/EBase.java b/slice2java/cpp/test/Ice/objects/Test/EBase.java
index f1d194429dc9..95cdf83620d8 100644
--- a/slice2java/cpp/test/Ice/objects/Test/EBase.java
+++ b/slice2java/cpp/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3811707879115480690L;
+    private static final long serialVersionUID = 3700800562067490574L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/EDerived.java b/slice2java/cpp/test/Ice/objects/Test/EDerived.java
index 9ab17eebf6a6..bbf23e7b6a64 100644
--- a/slice2java/cpp/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/cpp/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2216678957675904402L;
+    private static final long serialVersionUID = 4103184250893932690L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java
index 23e84df74db4..274c8fa40c41 100644
--- a/slice2java/cpp/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/cpp/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225290480198723107L;
+    private static final long serialVersionUID = -6225289997042357290L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java
index fe393f853a89..1cd9821a3205 100644
--- a/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/cpp/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3337312763429649260L;
+    private static final long serialVersionUID = 2039807864478487124L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/F.java b/slice2java/cpp/test/Ice/objects/Test/F.java
index 2618a529bfc6..c45c70903d28 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 = 4730116010182881169L;
+    private static final long serialVersionUID = 6219939546546604305L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/F1.java b/slice2java/cpp/test/Ice/objects/Test/F1.java
index dfca2eecadd9..98d55268cc7c 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 = 6192373607422864992L;
+    private static final long serialVersionUID = 6192376257688262765L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/F3.java b/slice2java/cpp/test/Ice/objects/Test/F3.java
index c1d7eed4359f..ef75448ba0b6 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 = -7941183921070053133L;
+    private static final long serialVersionUID = -590770446555312964L;
 
     /** @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 1b3bc60317f3..8e016ec38b29 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 = -1425257586158033792L;
+    private static final long serialVersionUID = -1425263524332727937L;
 
     /** @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 f15bb4a7643c..0e68cd098085 100644
--- a/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337225748757167013L;
+    private static final long serialVersionUID = -2337232368824554979L;
 }
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 1a2e3607711e..e9ea986e608a 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 = -1298675820133492623L;
+    private static final long serialVersionUID = -1298681592995155638L;
 
     /** @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 feefece61f62..5e420a686ca2 100644
--- a/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/cpp/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842241880832191231L;
+    private static final long serialVersionUID = 1842235260769411897L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/K.java b/slice2java/cpp/test/Ice/objects/Test/K.java
index 61a39a94a428..1a2a7fd85307 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 = 4645159905676944675L;
+    private static final long serialVersionUID = 4645165037979714602L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/L.java b/slice2java/cpp/test/Ice/objects/Test/L.java
index c5e195c6d280..6273818ee747 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 = 6629735759762696297L;
+    private static final long serialVersionUID = 6629741532623202095L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/M.java b/slice2java/cpp/test/Ice/objects/Test/M.java
index 0490ecf15270..da8589592bc9 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 = -8088100699306045238L;
+    private static final long serialVersionUID = -8088100376438831472L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/Recursive.java b/slice2java/cpp/test/Ice/objects/Test/Recursive.java
index 925216eb8df2..a53b2c1e6e3c 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 = 3617875670485829884L;
+    private static final long serialVersionUID = 3617880120889196279L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/objects/Test/S.java b/slice2java/cpp/test/Ice/objects/Test/S.java
index 442164709614..db6102521cf4 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 = 481769937606613978L;
+    private static final long serialVersionUID = 481768772704527004L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/SOneMember.java b/slice2java/cpp/test/Ice/objects/Test/SOneMember.java
index 2e8015f03bd9..d6f7a325b43a 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 = 6227751248573397963L;
+    private static final long serialVersionUID = 6227750248829851968L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java b/slice2java/cpp/test/Ice/objects/Test/STwoMembers.java
index 98abcaa3acc4..52a7e1e4ab06 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 = 7573879075947549186L;
+    private static final long serialVersionUID = -8275050422990751550L;
 }
diff --git a/slice2java/cpp/test/Ice/objects/Test/StructKey.java b/slice2java/cpp/test/Ice/objects/Test/StructKey.java
index 6b2f5a4aa741..a97c5aa001e9 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 = 4089440095654118963L;
+    private static final long serialVersionUID = -5112901380052349197L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/cpp/test/Ice/operations/Test/AnotherStruct.java
index 5a94719662be..ec976d11d0fb 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 = 2723841331371829978L;
+    private static final long serialVersionUID = 2723848455118277103L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyClass1.java b/slice2java/cpp/test/Ice/operations/Test/MyClass1.java
index 2b8af2777bc9..fda97b40bf0e 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 = 1242193275961781075L;
+    private static final long serialVersionUID = 2523101889934972998L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct.java
index 87d28a4f7c45..51079f97692d 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 = -1860945599831010147L;
+    private static final long serialVersionUID = 7045621716139491197L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java b/slice2java/cpp/test/Ice/operations/Test/MyStruct1.java
index c52f69b3455b..320c8e64b239 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 = -8414750144408119558L;
+    private static final long serialVersionUID = -4967325240653569553L;
 }
diff --git a/slice2java/cpp/test/Ice/operations/Test/Structure.java b/slice2java/cpp/test/Ice/operations/Test/Structure.java
index 8aa432077355..102a41d91e10 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 = -6125119338848005255L;
+    private static final long serialVersionUID = -5885496760748080788L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/A.java b/slice2java/cpp/test/Ice/optional/Test/A.java
index 613cb610988b..26af55a03994 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 = 6041755598442178576L;
+    private static final long serialVersionUID = 3669535380751765776L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/B.java b/slice2java/cpp/test/Ice/optional/Test/B.java
index 8f3c7d460d6f..f40c8919693c 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 = -6412256097090583709L;
+    private static final long serialVersionUID = -895263603614352093L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/C.java b/slice2java/cpp/test/Ice/optional/Test/C.java
index 9ac162cd2110..8025c067a573 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 = -8225394261157195267L;
+    private static final long serialVersionUID = -2591868118936279235L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java
index 50b2ce9de839..3fa82fbf2986 100644
--- a/slice2java/cpp/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/cpp/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5337266049872797853L;
+    private static final long serialVersionUID = 5934520158132356466L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/E.java b/slice2java/cpp/test/Ice/optional/Test/E.java
index ba19dfedcd86..021bbd84db63 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 = -1850742632078286815L;
+    private static final long serialVersionUID = -1850739347889078281L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/F.java b/slice2java/cpp/test/Ice/optional/Test/F.java
index 1a0211f8cb74..5483a7946781 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 = -6430489653093564846L;
+    private static final long serialVersionUID = -6430492942278312572L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java b/slice2java/cpp/test/Ice/optional/Test/FixedStruct.java
index 4b3b9d618574..2e3a34dad54f 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 = 1569604802846677042L;
+    private static final long serialVersionUID = 1569601275779845386L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/G.java b/slice2java/cpp/test/Ice/optional/Test/G.java
index 1bb3dbb09218..bfa94cbc40a3 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 = 740606228200453395L;
+    private static final long serialVersionUID = 4873577283161606099L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/G1.java b/slice2java/cpp/test/Ice/optional/Test/G1.java
index ac40912c62e3..ecd2631ea67b 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 = 7339781184786102765L;
+    private static final long serialVersionUID = 7339784711932780348L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/G2.java b/slice2java/cpp/test/Ice/optional/Test/G2.java
index c05277552e91..7cc8f42b51ae 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 = 3824547981260048374L;
+    private static final long serialVersionUID = 3824551265454184936L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java b/slice2java/cpp/test/Ice/optional/Test/MultiOptional.java
index 67e342455cd4..8fdfc5143481 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 = 7409328424402654722L;
+    private static final long serialVersionUID = 3931082110066709945L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/OneOptional.java b/slice2java/cpp/test/Ice/optional/Test/OneOptional.java
index 08802b615b9e..f41cee7c6463 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 = -7219601239838983588L;
+    private static final long serialVersionUID = -7219599322095548508L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java
index f951c5434e5f..bb313c9509d1 100644
--- a/slice2java/cpp/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/cpp/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 729045985813984958L;
+    private static final long serialVersionUID = -9142016813341620034L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/cpp/test/Ice/optional/Test/OptionalWithCustom.java
index 52eec1e0ac6c..f4c4b8db048c 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 = -501639396673050693L;
+    private static final long serialVersionUID = 8697335075230866491L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java
index b0b71956d6d6..fbb7526d65f7 100644
--- a/slice2java/cpp/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/cpp/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894235205665616228L;
+    private static final long serialVersionUID = 2894238490013873973L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java b/slice2java/cpp/test/Ice/optional/Test/SmallStruct.java
index 4c2f2d7e9db8..04de4e68e4b7 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 = 6700991251103549209L;
+    private static final long serialVersionUID = 6700987966921151608L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/VarStruct.java b/slice2java/cpp/test/Ice/optional/Test/VarStruct.java
index 3685d21a9200..f37ac1abac86 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 = -1912287682798058651L;
+    private static final long serialVersionUID = -1912284155651381068L;
 }
diff --git a/slice2java/cpp/test/Ice/optional/Test/WD.java b/slice2java/cpp/test/Ice/optional/Test/WD.java
index 1e82c30ab5fa..a2ab8ad39d1a 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 = 1197327465703034993L;
+    private static final long serialVersionUID = -4635403084858532072L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C.java b/slice2java/cpp/test/Ice/scope/Test/C.java
index 7ed7f0f68c8e..e74206ff4c6c 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 = -5190251956692557434L;
+    private static final long serialVersionUID = -5190248734397319483L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C1.java b/slice2java/cpp/test/Ice/scope/Test/C1.java
index 53e3b26246f3..b0dfee0cfa42 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 = 8893238024403841479L;
+    private static final long serialVersionUID = 8893234476658248452L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/scope/Test/C2.java b/slice2java/cpp/test/Ice/scope/Test/C2.java
index 67c6550ee019..d2f93413fe29 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 = 7313971639635526342L;
+    private static final long serialVersionUID = -6630247088032998011L;
 
     /** @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 300cb6d7e67d..5207948cb742 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 = 4615624796550957086L;
+    private static final long serialVersionUID = 4615627028106189460L;
 
     /** @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 306aaee89443..56cd35751610 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 = 672596260397154330L;
+    private static final long serialVersionUID = 672592871648573802L;
 
     /** @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 c866220a927f..c435cbd561cf 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 = 8654434610303413154L;
+    private static final long serialVersionUID = 8654438158048796833L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/Inner/S.java b/slice2java/cpp/test/Ice/scope/Test/Inner/S.java
index b26d0af5fbe7..e69060a1664b 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 = 3694622212461698286L;
+    private static final long serialVersionUID = 3694620139738480877L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S.java b/slice2java/cpp/test/Ice/scope/Test/S.java
index 39396c42f9d7..ccdb56a66d10 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 = 2159704692569941200L;
+    private static final long serialVersionUID = 2159701307554121555L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S1.java b/slice2java/cpp/test/Ice/scope/Test/S1.java
index 92d46309500a..396b494d9ad5 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 = 1241675531068617982L;
+    private static final long serialVersionUID = 1241678758368729661L;
 }
diff --git a/slice2java/cpp/test/Ice/scope/Test/S2.java b/slice2java/cpp/test/Ice/scope/Test/S2.java
index 1b826e769e0c..b7605432d149 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 = 5639266697845799999L;
+    private static final long serialVersionUID = 7760131709750829180L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java
index 17d222162c4c..f21c2cadf7e4 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477019731386885390L;
+    private static final long serialVersionUID = -477021756411101229L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 3344a04b9cd3..50b3f1181fa4 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485213044202343700L;
+    private static final long serialVersionUID = 3485210853874549109L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 6ab893fae6a1..700f088b003d 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717373844166708453L;
+    private static final long serialVersionUID = 1717376034651458436L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 6647e5ffc06d..0d689f348c56 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384914485983823748L;
+    private static final long serialVersionUID = -7384921961008170019L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index 5fc8475eebd2..c9b850332c00 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424376335976398570L;
+    private static final long serialVersionUID = 3424380166626984497L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 613c2e8d0e8c..272bc3c38a87 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172593728283517701L;
+    private static final long serialVersionUID = -1172598075369218144L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 9cda01185718..5a9d1b3ece38 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126107605803619966L;
+    private static final long serialVersionUID = -1126108708873759399L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index ecc32bba0edf..155308e9581a 100644
--- a/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
+++ b/slice2java/cpp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097577401441294110L;
+    private static final long serialVersionUID = -2097572888895621575L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/B.java b/slice2java/cpp/test/Ice/slicing/objects/Test/B.java
index 8e409f6f078c..e7c5f9dd6722 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 = -4451390636742635046L;
+    private static final long serialVersionUID = -887783071772402523L;
 
     /** @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 3306cb04e094..872c975f0104 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 116571899158849302L;
+    private static final long serialVersionUID = -7129603880055814551L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/cpp/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 09051449962f..e94a6ac703d4 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 = -6397002078132111819L;
+    private static final long serialVersionUID = -6396997840937143411L;
 
     /** @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 f5b900fafea0..a6fe40d2b9a0 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 = -9066889341573451401L;
+    private static final long serialVersionUID = -9066888223157687688L;
 
     /** @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 1abb45e6a3ff..7ea3cd8b0be8 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 = 3729313461077748409L;
+    private static final long serialVersionUID = -8041255948977832026L;
 
     /** @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 3688618191bb..da2d360f2ffd 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 = -449691699255051911L;
+    private static final long serialVersionUID = 5154673488706719877L;
 
     /** @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 0cd007a5d544..050b68c86cf9 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 = 4800533858367210625L;
+    private static final long serialVersionUID = 1439678115369223224L;
 
     /** @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 40e7231537e8..69e0d3955b7f 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 = 130239256180511859L;
+    private static final long serialVersionUID = 3881179163211253875L;
 
     /** @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 a404c2d03dac..787e5ac15d05 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6074869978761084469L;
+    private static final long serialVersionUID = -7536421010429137579L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/cpp/test/Ice/slicing/objects/Test/Forward.java
index 20dc986a9624..983e3684c7d2 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 = -7655931268816179174L;
+    private static final long serialVersionUID = -7655927257360104993L;
 
     /** @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 c0e7cbfecca3..7325e3ed4be9 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 = -2271120756416412439L;
+    private static final long serialVersionUID = -2271124602564672928L;
 
     /** @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 cebcbb3380e3..aac7760da94b 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 = 4147524542084497449L;
+    private static final long serialVersionUID = 4147528855808957897L;
 
     /** @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 e815ce98c565..354de18479df 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 = 481716997793495257L;
+    private static final long serialVersionUID = 481713151801982998L;
 
     /** @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 5f1012eb44ff..ee575e088af9 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 = -4426887105266762891L;
+    private static final long serialVersionUID = -4426883033076098739L;
 
     /** @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 950ce0aa1d6b..f8dcfd4ca7e5 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 = 850538650327812396L;
+    private static final long serialVersionUID = 850540038459145768L;
 
     /** @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 383ce7cbccd9..b30a8fc955d7 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 = -4328898602865463629L;
+    private static final long serialVersionUID = -4328908091387489997L;
 
     /** @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 519631f5903a..1ac3599acc14 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 = -5081818678857316494L;
+    private static final long serialVersionUID = -5081806545588712469L;
 
     /** @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 8c9a45c86484..6de838ace18b 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 = 643087725446851376L;
+    private static final long serialVersionUID = 643086441419608255L;
 
     /** @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 a654a5b52ec5..d2f1add86596 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 = -2438005195269249679L;
+    private static final long serialVersionUID = -2438000863531107903L;
 
     /** @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 3b1cab34f4e3..e53cafa9604a 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 = -3272520923453587631L;
+    private static final long serialVersionUID = 4511884797682803218L;
 
     /** @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 a4c2713df283..0f3253240981 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 = -8813708224396972402L;
+    private static final long serialVersionUID = -8813709564858039152L;
 
     /** @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 a8ffe545e9e5..bb37527a29bc 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 = 3651536676865399191L;
+    private static final long serialVersionUID = 3651532830873825556L;
 
     /** @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 b6e22c695dde..46e947307609 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 = 8804373929242818098L;
+    private static final long serialVersionUID = 8804372325073820977L;
 
     /** @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 bdbe79192569..868c2a31e544 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 = -4989057468509493295L;
+    private static final long serialVersionUID = -4989067242346155993L;
 
     /** @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 0f64d0cf3a8e..732bca932e98 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 = -5353758715743122236L;
+    private static final long serialVersionUID = -5353754383989107129L;
 
     /** @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 98a044988f80..40ff95ab53cc 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 = -6522143095404124158L;
+    private static final long serialVersionUID = -6522141976997593545L;
 
     /** @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 902561eb7322..cd93ef91c086 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 = 7620284901582971137L;
+    private static final long serialVersionUID = 7620283297413883892L;
 
     /** @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 d774263aa8c7..22eae4cbd9ff 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 = -1869488624382220396L;
+    private static final long serialVersionUID = -2369564662918659841L;
 }
diff --git a/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/cpp/test/Ice/slicing/objects/Test/SUnknown.java
index 98cc314014e5..8d2e80a5ada2 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 = 7308527877562520059L;
+    private static final long serialVersionUID = -6451433029244638422L;
 
     /** @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 69c6252515d7..791a877f8756 100644
--- a/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
+++ b/slice2java/cpp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6058605880502422173L;
+    private static final long serialVersionUID = 5743517656776095147L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java b/slice2java/cpp/test/Ice/stream/Test/ClassStruct.java
index 682c8b89a831..c04dd6b4cddc 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 = 4995620701223071068L;
+    private static final long serialVersionUID = 4995620074884625748L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java b/slice2java/cpp/test/Ice/stream/Test/LargeStruct.java
index c83f8942a69f..e2e42b07dc03 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 = 5682206917428999653L;
+    private static final long serialVersionUID = 714917015900246106L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/MyClass.java b/slice2java/cpp/test/Ice/stream/Test/MyClass.java
index d495224b7b2e..3b16e0a862b8 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 = -7892623597726633982L;
+    private static final long serialVersionUID = 9172154426505324255L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/cpp/test/Ice/stream/Test/MyException.java b/slice2java/cpp/test/Ice/stream/Test/MyException.java
index 72eecc48aec5..2b1e285f476f 100644
--- a/slice2java/cpp/test/Ice/stream/Test/MyException.java
+++ b/slice2java/cpp/test/Ice/stream/Test/MyException.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734227238004902106L;
+    private static final long serialVersionUID = 5734227934089533231L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java b/slice2java/cpp/test/Ice/stream/Test/OptionalClass.java
index e08736560677..59ed49b84fe0 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 = 8701588552852184714L;
+    private static final long serialVersionUID = 1414042329497310265L;
 
     /** @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 8820abcc6a7e..57c91ea09e73 100644
--- a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java
+++ b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1404700313586688268L;
+    private static final long serialVersionUID = -1404705307548823508L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/cpp/test/Ice/stream/Test/Sub/NestedStruct.java
index a4c012d73410..e6181bec2104 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 = -115557076111734681L;
+    private static final long serialVersionUID = 8451688740905667590L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java
index 6e566e35b373..5e42ccb2c493 100644
--- a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java
+++ b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedException2.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8562125795833083706L;
+    private static final long serialVersionUID = -8562132107217971682L;
 }
diff --git a/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/cpp/test/Ice/stream/Test2/Sub2/NestedStruct2.java
index 8d076894eb7d..29577afb5ca7 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 = -3248240489517329908L;
+    private static final long serialVersionUID = -1272517100731714331L;
 }
diff --git a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java
index a4c5ea6d789f..2f6f03fb75fb 100644
--- a/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/csharp/test/Glacier2/router/Test/CallbackException.java
@@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5024825215764149202L;
+    private static final long serialVersionUID = -2065998318838234401L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Base.java b/slice2java/csharp/test/Ice/defaultValue/Test/Base.java
index ecfa4bbf9ba6..0cc95f544aa6 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 = 3920249130069698165L;
+    private static final long serialVersionUID = -4726936054217986481L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java
index 768357972462..63e4e999f6b5 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/BaseEx.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6389211093587573503L;
+    private static final long serialVersionUID = -6428908726967222277L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaults.java
index e1a7b94c8b9f..c1d85909685b 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 = -3003306973740295282L;
+    private static final long serialVersionUID = -8046140649906011408L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 082ec4e7cc2e..d4ef37cc59c8 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 = 4715252291049470120L;
+    private static final long serialVersionUID = -2303177456418264802L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ClassProperty.java
index 57fcdf8b8c33..17e33a715dba 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 = -6263273054384427799L;
+    private static final long serialVersionUID = -7968814730278219053L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java b/slice2java/csharp/test/Ice/defaultValue/Test/Derived.java
index 9ea6c8fbf59d..156b0a7255c5 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 = 525421409550210563L;
+    private static final long serialVersionUID = 8767387677577982076L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java
index 3e1e5c63e4d8..601145220a5d 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/DerivedEx.java
@@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9101842608293927476L;
+    private static final long serialVersionUID = 582616669083118411L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index 197588a4e784..a818c06fc7fd 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5532865788420410710L;
+    private static final long serialVersionUID = -8113899620392469868L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index 36493c4ce7eb..f42d609d654c 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
@@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2551624433522017880L;
+    private static final long serialVersionUID = 7928936353040449966L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java
index 7f9ceb4a4f37..d03c971c6fdd 100644
--- a/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java
+++ b/slice2java/csharp/test/Ice/defaultValue/Test/ExceptionProperty.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6897738745022456505L;
+    private static final long serialVersionUID = -780806196018542589L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct.java
index 4d39cc5a3a0f..90617b56dab9 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 = 5127395183988720497L;
+    private static final long serialVersionUID = 5127390127821877498L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/InnerStruct2.java
index 8356bd61fb04..7e6af4c66cbe 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 = -7135055925169719905L;
+    private static final long serialVersionUID = -7135054330076768447L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct1.java
index 2bd2ba444583..a7c588226691 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 = -5249080460029376394L;
+    private static final long serialVersionUID = 3335999596904314771L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct2.java
index 77f80de17f68..eb8540998cef 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 = -1552523859755186061L;
+    private static final long serialVersionUID = -8834613817397607304L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct3.java
index c4efd2d4847d..6c9d11b40159 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 = -6381758139152807701L;
+    private static final long serialVersionUID = 476739478392511790L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java b/slice2java/csharp/test/Ice/defaultValue/Test/Struct4.java
index 912c537d3ccd..8033ce38dadf 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 = -2206841132367907668L;
+    private static final long serialVersionUID = 1848270374808177513L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructNoDefaults.java
index 5b0fc07126b4..7d8577b46c08 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 = -6692510231309814508L;
+    private static final long serialVersionUID = -6372854088743898333L;
 }
diff --git a/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java b/slice2java/csharp/test/Ice/defaultValue/Test/StructProperty.java
index 8985faec3eb8..747e6ab16b3f 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 = 613832103488750553L;
+    private static final long serialVersionUID = 7113525838390523939L;
 }
diff --git a/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java b/slice2java/csharp/test/Ice/dictMapping/Test/TEstNv.java
index c38b504abc44..11c091e26419 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 = 8114298230007391714L;
+    private static final long serialVersionUID = -7882078911988430588L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/A.java b/slice2java/csharp/test/Ice/exceptions/Test/A.java
index 48ecb51c1ffc..6c6343c0757c 100644
--- a/slice2java/csharp/test/Ice/exceptions/Test/A.java
+++ b/slice2java/csharp/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823745344006326346L;
+    private static final long serialVersionUID = 7823746574796869923L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/B.java b/slice2java/csharp/test/Ice/exceptions/Test/B.java
index 05f687781ece..125a43e02f89 100644
--- a/slice2java/csharp/test/Ice/exceptions/Test/B.java
+++ b/slice2java/csharp/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861410554353891446L;
+    private static final long serialVersionUID = -3861409323719745437L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/C.java b/slice2java/csharp/test/Ice/exceptions/Test/C.java
index e6e07f8eb3a1..7e35b1b4ab8a 100644
--- a/slice2java/csharp/test/Ice/exceptions/Test/C.java
+++ b/slice2java/csharp/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080699035209111626L;
+    private static final long serialVersionUID = 1080700265999655203L;
 }
diff --git a/slice2java/csharp/test/Ice/exceptions/Test/D.java b/slice2java/csharp/test/Ice/exceptions/Test/D.java
index 9431fd095801..c9535196823d 100644
--- a/slice2java/csharp/test/Ice/exceptions/Test/D.java
+++ b/slice2java/csharp/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780381713748186762L;
+    private static final long serialVersionUID = 4780382944382332771L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Color.java b/slice2java/csharp/test/Ice/hash/Test/Color.java
index 81c212f67eee..eab88faa8805 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 = -2991732528061526154L;
+    private static final long serialVersionUID = -3351237198000967946L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java b/slice2java/csharp/test/Ice/hash/Test/ColorPalette.java
index b31c47563a1a..7911181f3f44 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 = -2820063090766957777L;
+    private static final long serialVersionUID = -2820063027559396004L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Draw.java b/slice2java/csharp/test/Ice/hash/Test/Draw.java
index bc9d1670d6cc..339df946d31b 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 = -2413149867994437164L;
+    private static final long serialVersionUID = -3377005038751305951L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java
index d84ab01e445c..672687712478 100644
--- a/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java
+++ b/slice2java/csharp/test/Ice/hash/Test/InvalidLengthException.java
@@ -54,5 +54,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1224575907320250938L;
+    private static final long serialVersionUID = -1224575823279763825L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java
index aa6908bb1288..0baf5581b676 100644
--- a/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java
+++ b/slice2java/csharp/test/Ice/hash/Test/InvalidPointException.java
@@ -54,5 +54,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8727125881841236044L;
+    private static final long serialVersionUID = -8727125958105168643L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/OtherException.java b/slice2java/csharp/test/Ice/hash/Test/OtherException.java
index f5e23392011b..39d3a36854df 100644
--- a/slice2java/csharp/test/Ice/hash/Test/OtherException.java
+++ b/slice2java/csharp/test/Ice/hash/Test/OtherException.java
@@ -67,5 +67,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5573239207227433735L;
+    private static final long serialVersionUID = -7498237723487467215L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Pen.java b/slice2java/csharp/test/Ice/hash/Test/Pen.java
index 43543de5e798..093892559054 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 = 3170285520831728963L;
+    private static final long serialVersionUID = 7006273920015508413L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/hash/Test/Point.java b/slice2java/csharp/test/Ice/hash/Test/Point.java
index 041094bd77cf..fe28661dd292 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 = -298098498840360944L;
+    private static final long serialVersionUID = -2324845060639468944L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/PointD.java b/slice2java/csharp/test/Ice/hash/Test/PointD.java
index 362e5fe95426..7bb31d6296f3 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 = -6572454339645044753L;
+    private static final long serialVersionUID = 4625054755705910258L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/PointF.java b/slice2java/csharp/test/Ice/hash/Test/PointF.java
index bb61950aab97..cfc6afec6d3e 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 = -1321341638823182414L;
+    private static final long serialVersionUID = 5413833033483745565L;
 }
diff --git a/slice2java/csharp/test/Ice/hash/Test/Polyline.java b/slice2java/csharp/test/Ice/hash/Test/Polyline.java
index 2f16ce5dbae9..89a0a52a7f21 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 = -345039263922827330L;
+    private static final long serialVersionUID = -345039358260645352L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C1.java
index fff226fa62c2..8d9aff9e0cf7 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 = 2568818221333087450L;
+    private static final long serialVersionUID = 2568822366940142336L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/C2.java
index 767b975ce19a..d8d210695d74 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 = -6709847265688863251L;
+    private static final long serialVersionUID = -6709848521010461818L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java
index 5942d338134f..cd539b3cb6fa 100644
--- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java
+++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 244432986661287221L;
+    private static final long serialVersionUID = 244434257317841775L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java
index 438c535e7f9a..cec3a650f54a 100644
--- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java
+++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1207063469727241550L;
+    private static final long serialVersionUID = -1207062379860601703L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
index d16366dfdd9b..393a1569bc84 100644
--- a/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
+++ b/slice2java/csharp/test/Ice/namespacemd/NoNamespace/_notify.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7599601135942893634L;
+    private static final long serialVersionUID = 7599605320466013848L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C1.java
index 34adad0ac3c7..4ebb48cee2f1 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 = 9211539988954401449L;
+    private static final long serialVersionUID = 9211532645827273212L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/C2.java
index 21da33e2f4c2..c4853ac6b7a9 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 = 770570167730952811L;
+    private static final long serialVersionUID = 770568162007391524L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java
index 6caeca235a0f..b65b57d794c8 100644
--- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java
+++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4823069768391258586L;
+    private static final long serialVersionUID = -4823063708829402381L;
 }
diff --git a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java
index 9a4da5bee4c3..dac6a52d93ec 100644
--- a/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java
+++ b/slice2java/csharp/test/Ice/namespacemd/WithNamespace/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2279078276189859191L;
+    private static final long serialVersionUID = 2279074986899623992L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/A.java b/slice2java/csharp/test/Ice/objects/Test/A.java
index 5a6f454ac34b..3c2fb374bbfa 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 = -2787562718076101931L;
+    private static final long serialVersionUID = -522005888255801451L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/A1.java b/slice2java/csharp/test/Ice/objects/Test/A1.java
index d17f4f1b2eb7..29831fbe246f 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 = -5926743479361468010L;
+    private static final long serialVersionUID = -5926745983582563411L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/B.java b/slice2java/csharp/test/Ice/objects/Test/B.java
index 389af412148a..126ca7427ab2 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 = -8890910390057107715L;
+    private static final long serialVersionUID = -8890918475953209815L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/B1.java b/slice2java/csharp/test/Ice/objects/Test/B1.java
index e7e0f567a8ad..ed82d7bf4f56 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 = -4910671358592386876L;
+    private static final long serialVersionUID = 601519982968278404L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Base.java b/slice2java/csharp/test/Ice/objects/Test/Base.java
index fe35cb033dfd..e532971db4ba 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 = 9030756460490448816L;
+    private static final long serialVersionUID = -5062923773491644612L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/C.java b/slice2java/csharp/test/Ice/objects/Test/C.java
index 1e1d660df82b..686768ad1406 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 = -7451926030007393059L;
+    private static final long serialVersionUID = 1623490681842409919L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/COneMember.java b/slice2java/csharp/test/Ice/objects/Test/COneMember.java
index 10ef3aed9d87..50e4117e6a7f 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 = 3050969239567387012L;
+    private static final long serialVersionUID = 3050977166488229504L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/CTwoMembers.java
index 4eb233d9e869..bf58928834ae 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 = -1598945924888331749L;
+    private static final long serialVersionUID = -6347608722054276069L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/D.java b/slice2java/csharp/test/Ice/objects/Test/D.java
index 19cc5912644a..ca3a53765c55 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 = -4308477489182697044L;
+    private static final long serialVersionUID = -2790294530626579656L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/D1.java b/slice2java/csharp/test/Ice/objects/Test/D1.java
index 8bc273f44ead..70768ff029f3 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 = 2373784791080939267L;
+    private static final long serialVersionUID = 8825850938527935171L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/E.java b/slice2java/csharp/test/Ice/objects/Test/E.java
index f9d53cb00804..342ff6bb3e33 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 = 7012855851748216826L;
+    private static final long serialVersionUID = -5739188061538600028L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/EBase.java b/slice2java/csharp/test/Ice/objects/Test/EBase.java
index fe4ff5eea8d7..1722787f9624 100644
--- a/slice2java/csharp/test/Ice/objects/Test/EBase.java
+++ b/slice2java/csharp/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5986470090989929074L;
+    private static final long serialVersionUID = 1027059820942237774L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/EDerived.java b/slice2java/csharp/test/Ice/objects/Test/EDerived.java
index 036af94ae909..0acb24bda5a2 100644
--- a/slice2java/csharp/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/csharp/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4074783778369671278L;
+    private static final long serialVersionUID = -3597619475924577710L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java
index 20714e797196..8b8e1aeea302 100644
--- a/slice2java/csharp/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/csharp/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225284052475166581L;
+    private static final long serialVersionUID = -6225292183417946225L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java
index 128d1b0357a3..132e1f00d5d9 100644
--- a/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/csharp/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7123253738283056788L;
+    private static final long serialVersionUID = 7164114726447791124L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/F.java b/slice2java/csharp/test/Ice/objects/Test/F.java
index 1dfab68fccbc..a08a1491df04 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 = 4106528583894375121L;
+    private static final long serialVersionUID = 4880308553823955985L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/F1.java b/slice2java/csharp/test/Ice/objects/Test/F1.java
index 77c93b04030e..8280fc3d3cfb 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 = 6192374072508713873L;
+    private static final long serialVersionUID = 6192375397572110139L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/F3.java b/slice2java/csharp/test/Ice/objects/Test/F3.java
index 83db9c734af8..24b88eca8603 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 = 3701052390074664565L;
+    private static final long serialVersionUID = -6154793382952309311L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/IBase.java b/slice2java/csharp/test/Ice/objects/Test/IBase.java
index 768c5b2c65ad..e3cdc841ce14 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 = 4060267182878365904L;
+    private static final long serialVersionUID = 4060269648216532203L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/IDerived.java b/slice2java/csharp/test/Ice/objects/Test/IDerived.java
index 2bed612f8077..7254af60852d 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 = 7299532105994776264L;
+    private static final long serialVersionUID = 7299534610211060467L;
 
     /** @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 c954b4e4d3fc..62f97349f3ae 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 = -1425258472107647849L;
+    private static final long serialVersionUID = -1425260937378890173L;
 
     /** @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 f2a183478302..7067100c39f7 100644
--- a/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337226714935235537L;
+    private static final long serialVersionUID = -2337229180273401836L;
 }
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 f862131bec76..bd1c1155156d 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 = -1298687620316279689L;
+    private static final long serialVersionUID = -1298679491796886780L;
 
     /** @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 f2ccb5c010f8..591b44079162 100644
--- a/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/csharp/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842230335109523019L;
+    private static final long serialVersionUID = 1842238294486715056L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/K.java b/slice2java/csharp/test/Ice/objects/Test/K.java
index d0a6a5c8f9aa..efb0036c8704 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 = 4645159103584407892L;
+    private static final long serialVersionUID = 4645161769264969316L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/L.java b/slice2java/csharp/test/Ice/objects/Test/L.java
index b9134dc8bb56..01833165e9b6 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 = 6629747556177342045L;
+    private static final long serialVersionUID = 6629739431473347878L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/M.java b/slice2java/csharp/test/Ice/objects/Test/M.java
index 21ed66cba925..8d31fb7e4ff6 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 = -8088105347379715478L;
+    private static final long serialVersionUID = -8088097428027077371L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/Recursive.java b/slice2java/csharp/test/Ice/objects/Test/Recursive.java
index 14c1fc70b710..eaa226c033e6 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 = 3617885778704612275L;
+    private static final long serialVersionUID = 3617877854363089721L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/objects/Test/S.java b/slice2java/csharp/test/Ice/objects/Test/S.java
index 35921a0fc341..18699f270029 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 = 481774506674058478L;
+    private static final long serialVersionUID = 481771876023459605L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/S1.java b/slice2java/csharp/test/Ice/objects/Test/S1.java
index e36dfb9aae3e..16a694481846 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 = 7211342483858953430L;
+    private static final long serialVersionUID = 7211340024962747603L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/SC1.java b/slice2java/csharp/test/Ice/objects/Test/SC1.java
index 69bc8df7109d..ae35aacb74b2 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 = 186210482552238468L;
+    private static final long serialVersionUID = 186202562071998527L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/SOneMember.java b/slice2java/csharp/test/Ice/objects/Test/SOneMember.java
index 577e3997a93d..727246d747c8 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 = 6227745239204820509L;
+    private static final long serialVersionUID = 6227753197330513689L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java b/slice2java/csharp/test/Ice/objects/Test/STwoMembers.java
index af8cd29d5e09..a9c72509f218 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 = 6811281454828549378L;
+    private static final long serialVersionUID = 4658847085139081346L;
 }
diff --git a/slice2java/csharp/test/Ice/objects/Test/StructKey.java b/slice2java/csharp/test/Ice/objects/Test/StructKey.java
index 9fc01cbd0c90..3632bc400c3a 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 = -4273354600722038346L;
+    private static final long serialVersionUID = -149516377390211608L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java b/slice2java/csharp/test/Ice/operations/Test/AnotherStruct.java
index 9ad95f71698b..57756ee5706e 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 = 2723851186493310141L;
+    private static final long serialVersionUID = 2723847610493716277L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyClass1.java b/slice2java/csharp/test/Ice/operations/Test/MyClass1.java
index e259c4c83609..279dedbf1d41 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 = 8417191863486832255L;
+    private static final long serialVersionUID = -1085762217528276716L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct.java
index e427e39ebe5e..0e7cab9cfa19 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 = -4163983376149112515L;
+    private static final long serialVersionUID = -1948060407629336195L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java b/slice2java/csharp/test/Ice/operations/Test/MyStruct1.java
index 65437529388a..6da941b7456c 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 = -8886201860822657610L;
+    private static final long serialVersionUID = -2071770764207106627L;
 }
diff --git a/slice2java/csharp/test/Ice/operations/Test/Structure.java b/slice2java/csharp/test/Ice/operations/Test/Structure.java
index e9f9eb58b30e..0c5b678065e0 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 = -7898599731449618505L;
+    private static final long serialVersionUID = -3165519426279319714L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/A.java b/slice2java/csharp/test/Ice/optional/Test/A.java
index e3b599b8ee16..d8b964597071 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 = 1480053874429207568L;
+    private static final long serialVersionUID = 6418398794285941264L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/B.java b/slice2java/csharp/test/Ice/optional/Test/B.java
index 817ec99b2922..dff69eb12772 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 = -3427777288543187869L;
+    private static final long serialVersionUID = 4952157948609075683L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/C.java b/slice2java/csharp/test/Ice/optional/Test/C.java
index 8c23d791acba..cddf4d58625f 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 = -3344062456233614339L;
+    private static final long serialVersionUID = -2600628347788881283L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java
index de05148eb8f3..cd50e05ff059 100644
--- a/slice2java/csharp/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/csharp/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -9116277824034352495L;
+    private static final long serialVersionUID = 2317253451971197943L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/E.java b/slice2java/csharp/test/Ice/optional/Test/E.java
index 2ed172152a96..b926603cc2d7 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 = -1850740878110583343L;
+    private static final long serialVersionUID = -1850739165833726674L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/F.java b/slice2java/csharp/test/Ice/optional/Test/F.java
index 348d52310931..71effc8e49dd 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 = -6430496867226703966L;
+    private static final long serialVersionUID = -6430492799044299043L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java b/slice2java/csharp/test/Ice/optional/Test/FixedStruct.java
index edad2156426c..a21f50d12251 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 = 1569605200460614770L;
+    private static final long serialVersionUID = 1569601491535833962L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/G.java b/slice2java/csharp/test/Ice/optional/Test/G.java
index 4e8f921cbf80..a6ce709815b9 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 = -2288638784191380909L;
+    private static final long serialVersionUID = 4931378569439062355L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/G1.java b/slice2java/csharp/test/Ice/optional/Test/G1.java
index 88d1a4560b42..103236651898 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 = 7339780456558367775L;
+    private static final long serialVersionUID = 7339784651036811897L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/G2.java b/slice2java/csharp/test/Ice/optional/Test/G2.java
index 219dac4faa14..a0a980fad9ed 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 = 3824549735225511965L;
+    private static final long serialVersionUID = 3824551447516793007L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java b/slice2java/csharp/test/Ice/optional/Test/MultiOptional.java
index cd51ccfaa5fc..ae0667d127db 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 = -5220987832229523648L;
+    private static final long serialVersionUID = 4968902846081684076L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/OneOptional.java b/slice2java/csharp/test/Ice/optional/Test/OneOptional.java
index bd24141e66b7..39f55af3eb21 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 = -7219600356467343972L;
+    private static final long serialVersionUID = -7219599250993743228L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java
index a78fd8ce40e1..e8c2f8f30a06 100644
--- a/slice2java/csharp/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/csharp/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 550866293074387037L;
+    private static final long serialVersionUID = -7589926134534901992L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/csharp/test/Ice/optional/Test/OptionalWithCustom.java
index a025efd8b296..ba2fff0d76a1 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 = -3539565548230975621L;
+    private static final long serialVersionUID = 6974820262938500859L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java
index 8a65853efe10..4606a501f29c 100644
--- a/slice2java/csharp/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/csharp/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894242579951314006L;
+    private static final long serialVersionUID = 2894238671914095088L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java b/slice2java/csharp/test/Ice/optional/Test/SmallStruct.java
index 821b2f26ce86..fc0c6e31ea91 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 = 6700983546199823149L;
+    private static final long serialVersionUID = 6700987939684253131L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/VarStruct.java b/slice2java/csharp/test/Ice/optional/Test/VarStruct.java
index 8cdd95ebeb42..905ea0e487d8 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 = -1912288411025793641L;
+    private static final long serialVersionUID = -1912284216547349519L;
 }
diff --git a/slice2java/csharp/test/Ice/optional/Test/WD.java b/slice2java/csharp/test/Ice/optional/Test/WD.java
index ca7e212d5fcb..12e53aea6345 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 = 4231572155249304003L;
+    private static final long serialVersionUID = 3925651668881477309L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C.java b/slice2java/csharp/test/Ice/scope/Test/C.java
index 9e9e639c6763..8a596754a1fb 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 = -5190247388841418578L;
+    private static final long serialVersionUID = -5190245518800879524L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C1.java b/slice2java/csharp/test/Ice/scope/Test/C1.java
index a8c9e1e5aa82..7f19f50e86f4 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 = 8893233130950946630L;
+    private static final long serialVersionUID = 8893237723567700893L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/scope/Test/C2.java b/slice2java/csharp/test/Ice/scope/Test/C2.java
index 995e6ca95e24..d34e9b57e7c2 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 = 1474339024479436489L;
+    private static final long serialVersionUID = 3490900637470434858L;
 
     /** @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 c6d305269e21..d3827d73cc84 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 = 4615622956091848112L;
+    private static final long serialVersionUID = 4615623813782904386L;
 
     /** @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 d8ace4981a74..06c9eb264a84 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 = 672588965091026401L;
+    private static final long serialVersionUID = 672590504364672539L;
 
     /** @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 3bcc72bcbb9e..734ef733305c 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 = 8654439338298429230L;
+    private static final long serialVersionUID = 8654434911139727606L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/Inner/S.java b/slice2java/csharp/test/Ice/scope/Test/Inner/S.java
index bd3ef2578457..acba4aba7b98 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 = 3694621485290848098L;
+    private static final long serialVersionUID = 3694617740031832762L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S.java b/slice2java/csharp/test/Ice/scope/Test/S.java
index d05739abf7d6..208d908d4efc 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 = 2159697236999670108L;
+    private static final long serialVersionUID = 2159703709839384196L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S1.java b/slice2java/csharp/test/Ice/scope/Test/S1.java
index 6fa3ef874502..cb69ae1b54da 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 = 1241674814223095679L;
+    private static final long serialVersionUID = 1241681287065315620L;
 }
diff --git a/slice2java/csharp/test/Ice/scope/Test/S2.java b/slice2java/csharp/test/Ice/scope/Test/S2.java
index d03a067e815b..ab18f2d04fed 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 = -297916610219668432L;
+    private static final long serialVersionUID = 4620651533032635987L;
 }
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CR.java b/slice2java/csharp/test/Ice/seqMapping/Test/CR.java
index 600f38fccccf..c90c1d8a5ec3 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 = 2039935627540767332L;
+    private static final long serialVersionUID = 2039936907644937345L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/CV.java b/slice2java/csharp/test/Ice/seqMapping/Test/CV.java
index b3aa54302830..06cf2ff1c072 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 = -3369466136278923109L;
+    private static final long serialVersionUID = -3369456566551161058L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/S.java b/slice2java/csharp/test/Ice/seqMapping/Test/S.java
index a3bc9c591356..1f542c4edf7c 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 = -691297813202078668L;
+    private static final long serialVersionUID = -691296351321921871L;
 }
diff --git a/slice2java/csharp/test/Ice/seqMapping/Test/SD.java b/slice2java/csharp/test/Ice/seqMapping/Test/SD.java
index 6b4f3c8243ee..be7378440e9d 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 = 9219735364435255184L;
+    private static final long serialVersionUID = 9219736666168627221L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java
index 4ed833498bda..8424cff41bff 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477021136503897551L;
+    private static final long serialVersionUID = -477023839483496252L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 263ca581801d..db7878c85e16 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485211804392953175L;
+    private static final long serialVersionUID = 3485214546270625634L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 7fa8491da7f8..f15050e40d20 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717375249283999142L;
+    private static final long serialVersionUID = 1717378117571498003L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 518784a72ddf..abaa7b60849f 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384921180953632577L;
+    private static final long serialVersionUID = -7384918273772659894L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index eb82f0b35934..29b24bcb4e83 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424368879175757276L;
+    private static final long serialVersionUID = 3424370157733741717L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 6cd9848212b7..438cf27c5ce7 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172608086836185587L;
+    private static final long serialVersionUID = -1172598620532482236L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index 0699fa08bf33..45ae9d8aae7a 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126115228045145356L;
+    private static final long serialVersionUID = -1126113779022712003L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index b54b29457c22..2992d487bad5 100644
--- a/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
+++ b/slice2java/csharp/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097584858222978092L;
+    private static final long serialVersionUID = -2097583579664977251L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/B.java b/slice2java/csharp/test/Ice/slicing/objects/Test/B.java
index 4be94a2b3c39..583832915d9d 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 = 9165661049098004664L;
+    private static final long serialVersionUID = 1964156258418977456L;
 
     /** @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 ba757dd0371f..61214eab581b 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1698350285493798412L;
+    private static final long serialVersionUID = -7588900385649647876L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/csharp/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 225557768b69..4afd478fae70 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 = -6396993797112425662L;
+    private static final long serialVersionUID = -6397001136673021371L;
 
     /** @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 1a77f30b5e31..c5fc0ca43043 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 = -9066879880331964545L;
+    private static final long serialVersionUID = -9066879799055338873L;
 
     /** @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 d1481fa2c6f4..dc5990a0a262 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 = 3383433316416878491L;
+    private static final long serialVersionUID = -8121718647868285229L;
 
     /** @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 2e1494cc9473..aec8610499fc 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 = 4158487710706414555L;
+    private static final long serialVersionUID = -1227738936037355615L;
 
     /** @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 7dda74fdac21..481c8975eca1 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 = -2238411797338419729L;
+    private static final long serialVersionUID = 5318651704937954801L;
 
     /** @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 126f3e8c83d0..cc3113499baf 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 = -8686618122457297101L;
+    private static final long serialVersionUID = -5414107767109526669L;
 
     /** @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 d319bc69fb32..ce0c98802d68 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 967635647801013851L;
+    private static final long serialVersionUID = 6521188950665763623L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Forward.java
index e5d506c8433c..a1f2546554fd 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 = -7655919033404856469L;
+    private static final long serialVersionUID = -7655918830779659372L;
 
     /** @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 afafd0801beb..9071ba7ffc4e 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 = -2271132945356026838L;
+    private static final long serialVersionUID = -2271133029229317727L;
 
     /** @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 ddc758fffe12..d05e717849ff 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 = 4147525272042474277L;
+    private static final long serialVersionUID = 4147527872908323618L;
 
     /** @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 0eb9d72c35e7..021dc23d50b7 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 = 481704808922965806L;
+    private static final long serialVersionUID = 481704725056321918L;
 
     /** @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 3c111e633712..153c578f196d 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 = -4426878658943637502L;
+    private static final long serialVersionUID = -4426880708499773691L;
 
     /** @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 d03a3190963e..bff3ecf42497 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 = 850535664331031620L;
+    private static final long serialVersionUID = 850537734541108632L;
 
     /** @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 c95c3d8145a3..7825e7f3b28a 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 = -4328907015374294029L;
+    private static final long serialVersionUID = -4328906262671619058L;
 
     /** @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 f80c14255dbe..d5d69eb456f4 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 = -5081810268968931677L;
+    private static final long serialVersionUID = -5081802919141869868L;
 
     /** @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 9c9288f76f63..2aae045281af 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 = 643078098626084664L;
+    private static final long serialVersionUID = 643078017336306816L;
 
     /** @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 39674536b89c..83eb68be2b9c 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 = -2438003751182043314L;
+    private static final long serialVersionUID = -2438003667384145247L;
 
     /** @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 086111030ab3..25f415ffae4e 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 = 2590135799212144856L;
+    private static final long serialVersionUID = 3754411281552409548L;
 
     /** @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 6aa063f54807..8c49c08f8a72 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 = -8813706396859186861L;
+    private static final long serialVersionUID = -8813709066347270866L;
 
     /** @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 61340c624808..a390482a1468 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/PSUnknownException.java
@@ -61,5 +61,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4410694740640310109L;
+    private static final long serialVersionUID = 4410692041359601424L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java b/slice2java/csharp/test/Ice/slicing/objects/Test/Preserved.java
index cf201d989d14..5a58fd8f65fe 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 = 3651524484205716653L;
+    private static final long serialVersionUID = 3651524407929699039L;
 
     /** @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 b54b0f6fbcff..8ee2a5c9ea57 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 = 8804375211599063560L;
+    private static final long serialVersionUID = 8804375132741993978L;
 
     /** @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 0539246b6bbd..be76c1835094 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 = -4989069093096304398L;
+    private static final long serialVersionUID = -4989060920688664009L;
 
     /** @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 4e4907bdd0fe..0cf0b3c0a83c 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 = -5353757267916970434L;
+    private static final long serialVersionUID = -5353757191640673908L;
 
     /** @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 c513bc1f2116..2c10de6a7f25 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 = -6522133634102341281L;
+    private static final long serialVersionUID = -6522133552818497791L;
 
     /** @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 9b0d83b2ea86..ad7eea6af950 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 = 7620286185146139228L;
+    private static final long serialVersionUID = 7620286103859048962L;
 
     /** @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 83fe3194a92d..d7722b128fe2 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 = -7515195914152451670L;
+    private static final long serialVersionUID = 7634249286300929577L;
 }
diff --git a/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/csharp/test/Ice/slicing/objects/Test/SUnknown.java
index fb876a87c565..c3114333ee8b 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 = 2520885117383209393L;
+    private static final long serialVersionUID = 2514033725554376685L;
 
     /** @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 222926e8cec7..b177c92a2e26 100644
--- a/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
+++ b/slice2java/csharp/test/Ice/slicing/objects/Test/UnknownDerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4040839188849075619L;
+    private static final long serialVersionUID = 3093780981504142686L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java b/slice2java/csharp/test/Ice/stream/Test/LargeStruct.java
index f6c3e1d5daa0..e2744e8f158d 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 = -9163408562165880814L;
+    private static final long serialVersionUID = 4809514640114277871L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/MyClass.java b/slice2java/csharp/test/Ice/stream/Test/MyClass.java
index d70ad37a200a..603da6c1ebb3 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 = -6703394937942998624L;
+    private static final long serialVersionUID = 2132136628771776721L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Ice/stream/Test/MyException.java b/slice2java/csharp/test/Ice/stream/Test/MyException.java
index fb69a648031f..f1bbd635de5e 100644
--- a/slice2java/csharp/test/Ice/stream/Test/MyException.java
+++ b/slice2java/csharp/test/Ice/stream/Test/MyException.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734226142955585323L;
+    private static final long serialVersionUID = 5734225375715494862L;
 }
diff --git a/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java b/slice2java/csharp/test/Ice/stream/Test/OptionalClass.java
index bd9b738038dc..18e601807218 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 = -2091432783214444825L;
+    private static final long serialVersionUID = -1323284426138067613L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/Clash/Cls.java b/slice2java/csharp/test/Slice/escape/Clash/Cls.java
index cb7cfcc261bb..d7bd8a449cfb 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 = 5470973195869447155L;
+    private static final long serialVersionUID = 2828537391936203186L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/Clash/Ex.java b/slice2java/csharp/test/Slice/escape/Clash/Ex.java
index 1954e176db4d..d53618b638bf 100644
--- a/slice2java/csharp/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/csharp/test/Slice/escape/Clash/Ex.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4074825395086009070L;
+    private static final long serialVersionUID = 1374408021877311483L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/Clash/St.java b/slice2java/csharp/test/Slice/escape/Clash/St.java
index a5458019c386..890750af8e1a 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 = -563415701299919356L;
+    private static final long serialVersionUID = -8928680307454614411L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java
index 9fcabb2d93a6..20aae26d3c4b 100644
--- a/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java
+++ b/slice2java/csharp/test/Slice/escape/_abstract/BaseMethods.java
@@ -122,5 +122,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3247239676809140312L;
+    private static final long serialVersionUID = -8797978529743004565L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/_break.java b/slice2java/csharp/test/Slice/escape/_abstract/_break.java
index 75aabda6ca2e..9371ebc0ff95 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 = 3009638312352462087L;
+    private static final long serialVersionUID = 3009636642399294660L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/delegate.java b/slice2java/csharp/test/Slice/escape/_abstract/delegate.java
index 0c22054abca3..902e78d68785 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 = -8389302711112903831L;
+    private static final long serialVersionUID = 3919841846361466899L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java
index ee475263d49d..444abcada571 100644
--- a/slice2java/csharp/test/Slice/escape/_abstract/fixed.java
+++ b/slice2java/csharp/test/Slice/escape/_abstract/fixed.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8293823738363432429L;
+    private static final long serialVersionUID = -8293825379733991472L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java
index db37f0a88ee5..262968c70ee3 100644
--- a/slice2java/csharp/test/Slice/escape/_abstract/foreach.java
+++ b/slice2java/csharp/test/Slice/escape/_abstract/foreach.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4100966963161391613L;
+    private static final long serialVersionUID = 7986279142876462595L;
 }
diff --git a/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java b/slice2java/csharp/test/Slice/escape/_abstract/optionalMembers.java
index 52bdf18d25f8..cc90688975c2 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 = -54018671242251706L;
+    private static final long serialVersionUID = -7549656250077316388L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/macros/Test/Default.java b/slice2java/csharp/test/Slice/macros/Test/Default.java
index 5ab8c4371a2c..662a701e27ef 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 = -4267858250716739170L;
+    private static final long serialVersionUID = 7350414045191370622L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/macros/Test/NoDefault.java b/slice2java/csharp/test/Slice/macros/Test/NoDefault.java
index 1b3964db5825..73d2c049a827 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 = -5092136239231479809L;
+    private static final long serialVersionUID = -8589872831265816673L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/structure/Test/C.java b/slice2java/csharp/test/Slice/structure/Test/C.java
index d14079765c2a..a19add0b0c44 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 = -3172274754223103974L;
+    private static final long serialVersionUID = -3172274502485483504L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/csharp/test/Slice/structure/Test/S1.java b/slice2java/csharp/test/Slice/structure/Test/S1.java
index 9737b79abc03..d3da9ecab609 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 = -5542862020168884445L;
+    private static final long serialVersionUID = -5542862269348394334L;
 }
diff --git a/slice2java/csharp/test/Slice/structure/Test/S2.java b/slice2java/csharp/test/Slice/structure/Test/S2.java
index 0e6451f64d31..ea4b4e774a76 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 = -1206877647665365192L;
+    private static final long serialVersionUID = 4412599751759657649L;
 }
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 30c935a2f88d..8bebd185079d 100644
--- a/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/java/test/src/main/java/test/Glacier2/router/test/Glacier2/router/Test/CallbackException.java
@@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7344943493203223019L;
+    private static final long serialVersionUID = 4086412658890570055L;
 }
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 59fbf29146cc..160558509699 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 = 6434298793518191285L;
+    private static final long serialVersionUID = 6434294451450998788L;
 
     /** @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 0f7d61641cf9..33b163dd55c1 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 = 6384638967835000718L;
+    private static final long serialVersionUID = 6384635303924288835L;
 }
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 9a3eedc68b70..b6269946ae81 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 = -2014568615179816491L;
+    private static final long serialVersionUID = -2014567980847230246L;
 }
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 7ef1e6cff76e..d610f8ae0e9c 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 = 4853459378353851196L;
+    private static final long serialVersionUID = 5662530784059411676L;
 
     /** @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 f9a38cb8b67b..6fe83e569021 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/BaseEx.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7155199882972092856L;
+    private static final long serialVersionUID = 9020603997681917288L;
 }
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 00a127aca0d0..40eb3058a8e3 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 = 6399030934554274747L;
+    private static final long serialVersionUID = 5123656795475895739L;
 
     /** @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 41460fcc7b98..c63a2e7d5a6f 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 = -2314302898247396827L;
+    private static final long serialVersionUID = -6678971680779574248L;
 
     /** @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 452964fd3843..0a5f3aac41f3 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 = 1197924984513778355L;
+    private static final long serialVersionUID = 8186831215908675187L;
 
     /** @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 009e19d0f273..50861b1c79f3 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/DerivedEx.java
@@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4616480361286369660L;
+    private static final long serialVersionUID = -5444050634548863164L;
 }
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 bc6b2256449e..d2edb6dc14c7 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6546677806520487455L;
+    private static final long serialVersionUID = 2812838159648312095L;
 }
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 e21d03fa35d3..70c020485013 100644
--- a/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
+++ b/slice2java/java/test/src/main/java/test/Ice/defaultValue/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
@@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -125984032596829099L;
+    private static final long serialVersionUID = 3716336495349102632L;
 }
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 bdc6b0df0b10..4ff45e0015d1 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 = 5127387863783221645L;
+    private static final long serialVersionUID = 5127392291094405360L;
 }
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 2e8b7f93efac..9a34d6580fdc 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 = 1546087961842713679L;
+    private static final long serialVersionUID = 4750599809077320271L;
 }
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 d68de076a165..f956d108e6aa 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 = -6974961510003235652L;
+    private static final long serialVersionUID = 2974756677982029148L;
 }
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 70500aceef49..d2a043241d98 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 = -3789704945194576201L;
+    private static final long serialVersionUID = 7134458402821945482L;
 }
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 292986ade5cb..6bf40bcbcad5 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823743290665917716L;
+    private static final long serialVersionUID = 7823738302858514649L;
 }
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 b32511b18f8c..6c8704174f6a 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861407152685536044L;
+    private static final long serialVersionUID = -3861417430341001063L;
 }
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 b18ed3c91739..2887d3345b16 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080696981868702996L;
+    private static final long serialVersionUID = 1080691994061299929L;
 }
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 6bb6fc0d7eaa..a54003ec3533 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/AMD/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780385115416542164L;
+    private static final long serialVersionUID = 4780374837761077145L;
 }
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 37c54e6c0c60..6d6fa095b771 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823743259518888126L;
+    private static final long serialVersionUID = 7823739918558430032L;
 }
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 80d69b3116e7..426ac802c451 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861407183832565634L;
+    private static final long serialVersionUID = -3861416145261346288L;
 }
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 11a12b890752..d184808029a6 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080696950721673406L;
+    private static final long serialVersionUID = 1080693609761215312L;
 }
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 a836f8116129..ee8f77600e69 100644
--- a/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java
+++ b/slice2java/java/test/src/main/java/test/Ice/exceptions/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780385084269512574L;
+    private static final long serialVersionUID = 4780376122840731920L;
 }
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 91f1904d4c2e..818226174050 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 = 3441231451528775030L;
+    private static final long serialVersionUID = 2446816343668030710L;
 }
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 1a5db9d985d3..78b6e966e896 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 = -2820063635765450031L;
+    private static final long serialVersionUID = -2820066556947942986L;
 }
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 44fa2fa00a37..e1c5a0bcddd3 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 = -3358611241153415079L;
+    private static final long serialVersionUID = -3457969890521970173L;
 }
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 f6fb58ab600b..116213545792 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 = -4921071895714829788L;
+    private static final long serialVersionUID = -4450870522722766332L;
 
     /** @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 71944945bcac..a7241c8822e4 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 = 4158679659522860016L;
+    private static final long serialVersionUID = -5317772063580495792L;
 }
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 72dc9cd8ea9c..72938406734f 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 = 8119694062292120117L;
+    private static final long serialVersionUID = 9175496410781720790L;
 }
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 7f28172df9f7..5850f0a7fe97 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 = -9174305923768210183L;
+    private static final long serialVersionUID = 520095023368135401L;
 }
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 55f10599fa9d..544c2cc2eff4 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 = -345028810832413000L;
+    private static final long serialVersionUID = -345037432606342209L;
 }
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 075f93d1f68a..a7f6b48e0ea9 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 = 7333944329266555975L;
+    private static final long serialVersionUID = -2304574862094193849L;
 
     /** @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 d991d1205c40..3287293a3e96 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 = -5926743893996209902L;
+    private static final long serialVersionUID = -5926739182725798190L;
 
     /** @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 308996b0058e..1fc7173f4936 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 = -8890915107701733734L;
+    private static final long serialVersionUID = -8890911553582022310L;
 
     /** @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 4c36e744cdbc..1d6ca7adcb0e 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 = 4693177476168749316L;
+    private static final long serialVersionUID = 2809724675178652676L;
 
     /** @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 14d71268c2e0..ae6a78199a6c 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 = 8336742059829795751L;
+    private static final long serialVersionUID = -851043859143777497L;
 
     /** @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 b5291b720218..ff988220e142 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 = -5434271409783919800L;
+    private static final long serialVersionUID = 6289591724693979656L;
 
     /** @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 df6476aef8d7..9a62a0ebc4e9 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 = 3050979248496865318L;
+    private static final long serialVersionUID = 3050964949358912742L;
 
     /** @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 46ef81e91796..0e81b5ccdba7 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 = -492325586457471717L;
+    private static final long serialVersionUID = -2609408224909715813L;
 
     /** @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 ac7323bfd18d..51ee5be555ed 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 = 3921896411778681017L;
+    private static final long serialVersionUID = 6389462772204644473L;
 
     /** @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 96da7e8825e2..92f7d57175ed 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 = -475786125725554109L;
+    private static final long serialVersionUID = 3513632180487888195L;
 
     /** @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 bbe9e7fd2678..b8db5da42d9e 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 = 3873996304198772106L;
+    private static final long serialVersionUID = 7650557011520220170L;
 
     /** @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 95cd13dfbec9..379c60844431 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8133926506267994930L;
+    private static final long serialVersionUID = -1668883310676727346L;
 }
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 4e96528950b5..66f4c7f2f963 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3053758231131309102L;
+    private static final long serialVersionUID = 9205670495667168722L;
 }
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 4acac950803c..244d49e0eb3c 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225290093821986071L;
+    private static final long serialVersionUID = -6225279762082834135L;
 }
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 9c93e5bf8b29..283bf288fa6b 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5037930897066770836L;
+    private static final long serialVersionUID = 6190057663871075348L;
 }
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 744a13192f2a..dd9113ac1208 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 = -8471678822269171503L;
+    private static final long serialVersionUID = -5996183876094336303L;
 
     /** @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 33ace8b64e4f..51362cfedeb1 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 = 6192365907709572116L;
+    private static final long serialVersionUID = 6192373949741419397L;
 
     /** @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 eb94ab6e52a7..68786cbe5f23 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 = -943535777713625340L;
+    private static final long serialVersionUID = -5952049879832860412L;
 
     /** @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 794edfbd99ba..421116f34c66 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 = -1425257564279086032L;
+    private static final long serialVersionUID = -1425254175467274640L;
 
     /** @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 c72cea868dab..2f6644b6d4eb 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337225809680371669L;
+    private static final long serialVersionUID = -2337225231107460757L;
 }
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 6004efee181b..93648ee99384 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 = -1298676123826326891L;
+    private static final long serialVersionUID = -1298689100344681387L;
 
     /** @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 8629b291b6cb..aaddcb675dac 100644
--- a/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/java/test/src/main/java/test/Ice/objects/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842241660065806415L;
+    private static final long serialVersionUID = 1842226038464792719L;
 }
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 269b38dace39..e0751ecd77dd 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 = 4645159684761962678L;
+    private static final long serialVersionUID = 4645160263335012982L;
 
     /** @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 f014fb861520..03b9ce862595 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 = 6629736058330233817L;
+    private static final long serialVersionUID = 6629743579844424473L;
 
     /** @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 2547e78fefce..72bdddaa6efd 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 = -8088100793667121011L;
+    private static final long serialVersionUID = -8088101372244910387L;
 
     /** @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 97a0255aa7b3..da36340c0c89 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 = 3617875769851962600L;
+    private static final long serialVersionUID = 3617887258751014696L;
 
     /** @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 ee5009965dcd..d75e96197da9 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 = 481769789024585450L;
+    private static final long serialVersionUID = 481773343149175338L;
 }
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 97105932c155..b138f6e8af0a 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 = 6227751115317273727L;
+    private static final long serialVersionUID = 6227749214281023167L;
 }
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 a7a6cac62dc5..2dbf1c61b63c 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 = -2468076230860754174L;
+    private static final long serialVersionUID = -2896416649208958078L;
 }
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 ac6f864779b8..3c5e6697d9e6 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 = 4864282461243768774L;
+    private static final long serialVersionUID = 6996463745980203590L;
 }
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 549798ec5a4c..7797ff8f462c 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 = 2723841335178949903L;
+    private static final long serialVersionUID = 2723841514764730534L;
 }
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 74de1fb025d1..ccdd492a718e 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 = -481815330483131282L;
+    private static final long serialVersionUID = 8757744938043841332L;
 
     /** @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 48b5c5809060..3aa0ebcf7207 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 = -4526272251691193411L;
+    private static final long serialVersionUID = -1395430870315846499L;
 }
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 f75c535cfcf6..56b8375bb77b 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 = -8281891807812651961L;
+    private static final long serialVersionUID = 3421783326116027773L;
 }
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 db808624d31c..1c44fe4a081c 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 = 4136997585339501667L;
+    private static final long serialVersionUID = -8888516362014852733L;
 }
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 2d3666247943..2828179dc983 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 = 2723841594778821558L;
+    private static final long serialVersionUID = 2723841358411769173L;
 }
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 49cb03a254d3..0793dc524f49 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 = 4162403844349969955L;
+    private static final long serialVersionUID = -5329718089561322457L;
 
     /** @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 07d28a448aa4..ff54d1ed33f8 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 = 4613303360860049565L;
+    private static final long serialVersionUID = -7058587997579229923L;
 }
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 0447cd3c020d..de9bd00f3e40 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 = 5443858786021495690L;
+    private static final long serialVersionUID = -182233496165316754L;
 }
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 b8782cfc01b9..4956d3cb55e5 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 = -1901464920591724382L;
+    private static final long serialVersionUID = -7513122971072631740L;
 }
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 58d2b287aa13..5597650e2a4c 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 = 631338495895627024L;
+    private static final long serialVersionUID = -2007878491546581488L;
 
     /** @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 95e48fa004ad..18f4192e0334 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 = -8221631989394272669L;
+    private static final long serialVersionUID = 4662025794690450467L;
 
     /** @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 7ace08a95748..2a9fe42a8cdd 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 = -3404214282716687363L;
+    private static final long serialVersionUID = 3123686696205187453L;
 
     /** @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 7e3d6cf0048f..74b665b688cf 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5869789473879495139L;
+    private static final long serialVersionUID = -2769302612598748728L;
 }
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 64b2b54ba16f..279614f9b895 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 = -1850738969408862482L;
+    private static final long serialVersionUID = -1850742824421877008L;
 
     /** @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 cc541aa6f700..f5e0d5df3e22 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 = -6430492638868045923L;
+    private static final long serialVersionUID = -6430489476068044541L;
 
     /** @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 fb9057f7b603..f356e1aeefc3 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 = 1569601654084826931L;
+    private static final long serialVersionUID = 1569604742076448836L;
 }
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 9bb6d5776d8b..4988691748c3 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 = -1664028785936656941L;
+    private static final long serialVersionUID = 1265844901571365971L;
 
     /** @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 00ea25e42f87..afc32bb9538d 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 = 7339784333452191597L;
+    private static final long serialVersionUID = 7339781235401040582L;
 }
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 53de80cf85d7..a88070e536ee 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 = 3824550962041819796L;
+    private static final long serialVersionUID = 3824547788907763786L;
 }
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 d0f4de8f1c21..c955e312dce6 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 = 4880643000267119688L;
+    private static final long serialVersionUID = -738338136970341718L;
 
     /** @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 fbcf5297140d..8d38d5f471a6 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 = -7219599455017958819L;
+    private static final long serialVersionUID = -7219601300618681750L;
 
     /** @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 a375f5057848..1ffcb10294bb 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7224104101712818542L;
+    private static final long serialVersionUID = 6861733884025755095L;
 }
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 6db9836b831d..5d2c842eab7c 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 = 9209577454703622203L;
+    private static final long serialVersionUID = 5412875199788471483L;
 
     /** @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 e1c7d20af2be..d7d79b5a3eed 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/AMD/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894239038654983908L;
+    private static final long serialVersionUID = 2894235178631348495L;
 }
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 706874d8a35a..401dfd694363 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 = 6700987417969439149L;
+    private static final long serialVersionUID = 6700991267967364476L;
 }
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 0e827ca67a53..aea06c14983c 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 = -1912283852237457179L;
+    private static final long serialVersionUID = -1912287632183104434L;
 }
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 42d5c76d9d8e..0348657c9a8d 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 = 6551463318402182736L;
+    private static final long serialVersionUID = -3500733738358300500L;
 
     /** @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 5cdfc01d3bdb..7d44621aff66 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 = -3855498711393298800L;
+    private static final long serialVersionUID = -7827062897512371184L;
 
     /** @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 b3e646dd5b71..aaed3a46b0d5 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 = 7192020994533269155L;
+    private static final long serialVersionUID = 2359241415116726499L;
 
     /** @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 086845d4f017..acf3a802eced 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 = 7462791742833903613L;
+    private static final long serialVersionUID = -1880990808266272643L;
 
     /** @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 cf6eba9596cc..6c1faeba6d46 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4980208952962677723L;
+    private static final long serialVersionUID = 6154244555941271119L;
 }
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 f0eb36665a46..622393ae9bcd 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 = -1850734356183395436L;
+    private static final long serialVersionUID = -1850735984956836927L;
 
     /** @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 c0c45b2dc7f0..7d4f7ebc8bc2 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 = -6430497613690730521L;
+    private static final long serialVersionUID = -6430495979912275406L;
 
     /** @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 0b5aa2f0e2f6..cb809cf30d40 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 = 1569602134525016068L;
+    private static final long serialVersionUID = 1569611780737538003L;
 }
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 f87005743d8c..4fc4739624c3 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 = 2730665247469578451L;
+    private static final long serialVersionUID = -5727102055443756525L;
 
     /** @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 c8f38f07562f..1f044b76a88b 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 = 7339784008099909547L;
+    private static final long serialVersionUID = 7339774527354376257L;
 }
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 ecce0560e612..000c4b1ff464 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 = 3824556257139145843L;
+    private static final long serialVersionUID = 3824554628370090720L;
 }
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 981cc343d82d..739e63ec291e 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 = 1383219475918718561L;
+    private static final long serialVersionUID = 1619304249018570390L;
 
     /** @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 a53017e7a1fc..89210edd86cb 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 = -7219598612994908758L;
+    private static final long serialVersionUID = -7219599872255883395L;
 
     /** @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 7d983b47f6a1..54f37b1cd629 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5660460071122506424L;
+    private static final long serialVersionUID = 1231356656482373374L;
 }
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 e0e0f7a2aec3..eac61ad10341 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 = -5150531987453144389L;
+    private static final long serialVersionUID = 1444268311155769787L;
 
     /** @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 38245d3c9bf3..b734539884cf 100644
--- a/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/optional/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894238031405958946L;
+    private static final long serialVersionUID = 2894236893705224968L;
 }
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 6ff566ab8de8..1002496411e7 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 = 6700988580355912173L;
+    private static final long serialVersionUID = 6700989883521222663L;
 }
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 e7d8b8e5182a..d3682620f1e3 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 = -1912284859484251869L;
+    private static final long serialVersionUID = -1912294340229211191L;
 }
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 9d72818845ce..200c3aef798b 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 = 4079838684594752449L;
+    private static final long serialVersionUID = -9104647003554433380L;
 
     /** @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 0a326ea2948c..c2cb47b5b7a0 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 = 1894608658176681621L;
+    private static final long serialVersionUID = 1894604845902268280L;
 
     /** @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 afe05a7d4935..dbadfc732c34 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 = 2892574470767848353L;
+    private static final long serialVersionUID = 2892578975497458876L;
 
     /** @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 68cd3bab9b1c..42b0f5bad5fb 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5787332576888724762L;
+    private static final long serialVersionUID = 5787336593518501047L;
 }
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 14cb852ab4ff..891324f7feff 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4908753508211896827L;
+    private static final long serialVersionUID = 4908757364594975718L;
 }
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 980aebf5f027..d324b202a4fe 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/Test1/_notify.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4322854902204734445L;
+    private static final long serialVersionUID = 4322855658863572288L;
 }
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 062a47bcf1f0..3c8e018b819b 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 = 5832345816792121163L;
+    private static final long serialVersionUID = 5832347702179172035L;
 
     /** @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 5bd65e7322dc..a7d06e519865 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 = 2769376944047647029L;
+    private static final long serialVersionUID = 2769374898565354325L;
 
     /** @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 1f031d790027..78facbdf5b7a 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5344590169412504196L;
+    private static final long serialVersionUID = 5344589567591594764L;
 }
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 5d05c6870fbe..3c7c1cf42421 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/modpkg/Test3/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8399046986221207187L;
+    private static final long serialVersionUID = -8399053203394100851L;
 }
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 cda1433da6c5..67db0767ab12 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 = -860914696657009270L;
+    private static final long serialVersionUID = -860920913785826174L;
 
     /** @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 30ef1be0b2fd..74e4eb175fdf 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 = 954148769029279445L;
+    private static final long serialVersionUID = 954152183560484981L;
 
     /** @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 1b65f01faeee..f02f6e89c8ce 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6934989892936733477L;
+    private static final long serialVersionUID = 6934991933461660461L;
 }
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 1cfbe6be20a6..6f411fe3ca1d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/packagemd/test/Ice/packagemd/testpkg/Test2/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5414537669665567564L;
+    private static final long serialVersionUID = 5414534094840670892L;
 }
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 ed0856a54c5a..545d4d9b90c1 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 = -5190249916179683382L;
+    private static final long serialVersionUID = -5190248378115166566L;
 
     /** @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 e7d48fdbe0aa..7fefc08b2244 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 = 8893230730026494934L;
+    private static final long serialVersionUID = 8893234786603907347L;
 
     /** @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 9855a420518d..c93b784048df 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 = -2769564389938905680L;
+    private static final long serialVersionUID = -1083126807788268150L;
 
     /** @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 a49e5f82b29d..d5dd334e2ad8 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 = 4615625318311602977L;
+    private static final long serialVersionUID = 4615626755599106477L;
 
     /** @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 5357cdb9cedc..f9b7e6f89ec0 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 = 672580943584795513L;
+    private static final long serialVersionUID = 672593436140896963L;
 
     /** @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 d6c2de1b07ce..77c24ec1efbb 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 = 8654441904527042999L;
+    private static final long serialVersionUID = 8654437682641112511L;
 }
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 e9716095684e..2f15b54a9e3c 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 = 3694613337491702651L;
+    private static final long serialVersionUID = 3694620501187527283L;
 }
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 6dc7fe0a7253..629b558cb3f1 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 = 2159705219490913349L;
+    private static final long serialVersionUID = 2159701031337428685L;
 }
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 fde3a58b24d6..4e9ae3afccc4 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 = 1241671770300042223L;
+    private static final long serialVersionUID = 1241678618878726186L;
 }
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 5a7bdc6848d2..1f04b10d40f9 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 = -8136597253734860087L;
+    private static final long serialVersionUID = -2372999412587690509L;
 }
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 1705a83c959f..60766afc6bf7 100644
--- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java
+++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/AMD/Test/Bar.java
@@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8588832438309156477L;
+    private static final long serialVersionUID = -5450683851654710250L;
 }
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 88bdd6278391..f70dae7ed714 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 = -8649231792168462974L;
+    private static final long serialVersionUID = -2358299698365950185L;
 
     /** @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 e05ff0660262..31000557d0a1 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 = -8893236477612102092L;
+    private static final long serialVersionUID = 7136457657048783777L;
 }
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 f13fb5374f7c..4811d474277d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java
+++ b/slice2java/java/test/src/main/java/test/Ice/seqMapping/test/Ice/seqMapping/Test/Bar.java
@@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3557389838364860633L;
+    private static final long serialVersionUID = -1088190135706036480L;
 }
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 56513da68582..f9fd73371015 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 = -1883067341595329562L;
+    private static final long serialVersionUID = 5182727085065643009L;
 
     /** @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 9662fd1e419b..d2b31dd9bfdb 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 = -7465046019816355696L;
+    private static final long serialVersionUID = -8163267141021630281L;
 }
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 decb2938007c..897e94d7ddb7 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477015018901123286L;
+    private static final long serialVersionUID = -477024423227646982L;
 }
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 f39bfd53fa12..22c53cfe38b9 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485212461835313996L;
+    private static final long serialVersionUID = 3485213807531622428L;
 }
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 d2cea0a7fd4a..d2761284c10d 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717368966373898813L;
+    private static final long serialVersionUID = 1717378535989783661L;
 }
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 f08c3ac47bf0..79675f5f91e4 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384920683815019612L;
+    private static final long serialVersionUID = -7384919177797280908L;
 }
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 1105de0acf07..fed85565ff3e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreserved.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2733706412846264927L;
+    private static final long serialVersionUID = -2733696804324088591L;
 }
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 09a51dbcae7f..90d889f3e11c 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/client/Test/KnownPreservedDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4528104861520499624L;
+    private static final long serialVersionUID = 4528106367510638712L;
 }
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 a0cddc0a0a06..f708eb12d9ff 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477020250408253185L;
+    private static final long serialVersionUID = -477021053848127111L;
 }
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 9cb3a1d266fc..35f78c2d4cee 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485217814891183385L;
+    private static final long serialVersionUID = 3485211721741241503L;
 }
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 07b919b064f5..7eddc6f50465 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717374528648487528L;
+    private static final long serialVersionUID = 1717375166628663534L;
 }
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 9e7f0667c130..7d5fd70e1b7b 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384915005001017487L;
+    private static final long serialVersionUID = -7384921263610657289L;
 }
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 a940a8640c7a..1095c5bafc08 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424367554149658748L;
+    private static final long serialVersionUID = 3424380386017108218L;
 }
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 3e0dc4c43d3f..32a4d6b2237e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172601146474178067L;
+    private static final long serialVersionUID = -1172597778328827285L;
 }
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 f978d24adf63..ccbc9a1babe4 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived1.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126116553094657644L;
+    private static final long serialVersionUID = -1126109010923611374L;
 }
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 fc124799d051..184675c879e5 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/server/Test/UnknownMostDerived2.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097586183268033932L;
+    private static final long serialVersionUID = -2097573351400584462L;
 }
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 d9fde89a415d..14e3c8f3cacd 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477019604844481052L;
+    private static final long serialVersionUID = -477014713974007247L;
 }
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 265006e8506f..57183ced1b32 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485213000294411394L;
+    private static final long serialVersionUID = 3485212260374015063L;
 }
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 30f3af97f728..77b44fb17e77 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717373883065602291L;
+    private static final long serialVersionUID = 1717368971550754854L;
 }
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 a8e94a029607..3f31c57003fb 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384914359408928022L;
+    private static final long serialVersionUID = -7384920533845369281L;
 }
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 d7f0c1b9d9cf..a3f3f549a0cf 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424368192123403495L;
+    private static final long serialVersionUID = 3424372917686114610L;
 }
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 0199b316dfbd..dac0e66eceb8 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172601784476649610L;
+    private static final long serialVersionUID = -1172595775347827805L;
 }
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 f9a05a32615e..e6294e424440 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived1.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126115910097073649L;
+    private static final long serialVersionUID = -1126111163885384742L;
 }
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 59e8556a30b4..1ecc03b302ba 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/exceptions/test/Ice/slicing/exceptions/serverAMD/Test/UnknownMostDerived2.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097585545275315473L;
+    private static final long serialVersionUID = -2097580799068091590L;
 }
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 8deafc4fd51d..26379a67525d 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 = 1550905740320916951L;
+    private static final long serialVersionUID = -7893022452987101641L;
 
     /** @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 e4e21c0cbd03..0c24e106779e 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -819495636280061413L;
+    private static final long serialVersionUID = -3648105171623463557L;
 }
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 7a6fc414c4ad..35c8bae64166 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 = -6396993456168823447L;
+    private static final long serialVersionUID = -6396991631405244328L;
 
     /** @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 339146044c9f..9786db898a89 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 = -9066889782159556729L;
+    private static final long serialVersionUID = -9066886154342966092L;
 
     /** @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 486a4b9eba70..f6994a262241 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 = -3443309508769993292L;
+    private static final long serialVersionUID = 2770516387944128820L;
 
     /** @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 39f4bd46fd27..23b0d9d1016d 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 = 2695941353165974774L;
+    private static final long serialVersionUID = 5005652371666248566L;
 
     /** @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 199512705b27..285d0a262ead 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/client/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -508455103001631561L;
+    private static final long serialVersionUID = 8770143690734518838L;
 }
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 ee3b879001ba..e0b55e93f9f9 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 = -7655930988471342503L;
+    private static final long serialVersionUID = -7655929341768772856L;
 
     /** @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 28e020525510..3ffc85b947c9 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 = -2271120871543907941L;
+    private static final long serialVersionUID = -2271122683558516214L;
 
     /** @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 8dd84f3df334..cea6ed1ce3ce 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 = 481716756431360337L;
+    private static final long serialVersionUID = 481719242384645113L;
 
     /** @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 94ebd13248db..01bdf13e338b 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 = -4426878317995574743L;
+    private static final long serialVersionUID = -4426882113700457320L;
 
     /** @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 f3022969e441..cc935b7738a3 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 = 850536005277389964L;
+    private static final long serialVersionUID = 850539139645229668L;
 
     /** @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 9dd116c5aabf..aea03fca3dac 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 = -4328906674520275770L;
+    private static final long serialVersionUID = -4328904857400220515L;
 
     /** @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 9249db941e26..9f46ce24a521 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 = -5081810609895956930L;
+    private static final long serialVersionUID = -5081812424344329339L;
 
     /** @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 06db7944b764..7240fa0cad72 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 = 643087610319952512L;
+    private static final long serialVersionUID = 643091256041656947L;
 
     /** @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 ce03ec4ed11f..25c0a9a472a7 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 = -2438004759789413783L;
+    private static final long serialVersionUID = -2438008392667555542L;
 
     /** @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 8095b4d7c16b..f483af41838d 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 = 3651537243737782455L;
+    private static final long serialVersionUID = 3651534770503112780L;
 
     /** @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 941be980d834..0b577693319d 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 = 8804374175821866770L;
+    private static final long serialVersionUID = 8804377150008364265L;
 
     /** @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 41b0735bc10b..bcc1606d0d53 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 = -5353758115138088412L;
+    private static final long serialVersionUID = -5353756458101549281L;
 
     /** @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 b35a75ec8c4d..c369488e8b31 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 = -6522143019186493330L;
+    private static final long serialVersionUID = -6522145342543456056L;
 
     /** @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 516a721f2b9d..0a66d3736c12 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 = 7620284982950373805L;
+    private static final long serialVersionUID = 7620282667183096651L;
 
     /** @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 b972729f73ee..58f3a764cca0 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 = 4472114031633243242L;
+    private static final long serialVersionUID = -8432767862089252890L;
 }
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 ea13f7ed1629..92e2ac60b665 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 = -211353351432041129L;
+    private static final long serialVersionUID = -562037203864355926L;
 
     /** @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 a465f159da10..50cf0f8ab8d4 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6756328557870722917L;
+    private static final long serialVersionUID = 6721294303809755494L;
 }
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 67ea4255f8a7..db0fd189d11a 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 = -9066880640997470353L;
+    private static final long serialVersionUID = -9066888096754147319L;
 
     /** @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 7e091fcbee98..c5ea5e78a85e 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 = 2245116327542174388L;
+    private static final long serialVersionUID = 4737685250735410025L;
 
     /** @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 89b715b39c29..1cfa4da9ed24 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 = -2947790469167423977L;
+    private static final long serialVersionUID = 340765227866489098L;
 
     /** @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 ef0046fb78a3..de7ac2050e50 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 = -7339451837794904589L;
+    private static final long serialVersionUID = 1951917237658810227L;
 
     /** @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 0134dd3a2f47..bbf6b6057b07 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7588739567745910601L;
+    private static final long serialVersionUID = -8334753134853347153L;
 }
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 96c6fa2f4600..fc985470bba9 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 = -7655923769015701408L;
+    private static final long serialVersionUID = -7655927165859719593L;
 
     /** @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 d0d4f9d53e04..9976e55fc880 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 = -2271128090855168397L;
+    private static final long serialVersionUID = -2271124646471195410L;
 
     /** @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 926f87808c95..f5f0e038b59b 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 = 4147527991944294774L;
+    private static final long serialVersionUID = 4147524381943415248L;
 
     /** @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 a251ef933467..898f12cab64c 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 = 481713835126074425L;
+    private static final long serialVersionUID = 481713107999236959L;
 
     /** @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 c0a47d350103..01fc9d78fc54 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 = 643085598051714856L;
+    private static final long serialVersionUID = 643086480320589582L;
 
     /** @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 8071443df8b7..b959927bd67d 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 = -2438013740662130303L;
+    private static final long serialVersionUID = -2438000984925005679L;
 
     /** @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 9b222968e2b6..b17d720d27a3 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 = 705745433772844868L;
+    private static final long serialVersionUID = -2078233864397132207L;
 
     /** @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 580d9a82cc9d..f796b12931dd 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 = -8813709106213696436L;
+    private static final long serialVersionUID = -8813708384542522326L;
 
     /** @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 2e06c2342b0a..bcada8004d02 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/PSUnknownException.java
@@ -61,5 +61,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4410692000172399702L;
+    private static final long serialVersionUID = 4410703690596979509L;
 }
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 a8d04d041a35..c309ade7f932 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 = 3651529342551118111L;
+    private static final long serialVersionUID = 3651532759914960878L;
 
     /** @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 18b1a67e9314..a0f7fc71d9f3 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 = 8804382392008118202L;
+    private static final long serialVersionUID = 8804372246382254795L;
 
     /** @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 7ebf3186466c..46a41a676dbb 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 = -4989060923255977665L;
+    private static final long serialVersionUID = -4989057500882525938L;
 
     /** @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 6f4580e3536e..7f832284d7b5 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 = -5353761805978027956L;
+    private static final long serialVersionUID = -5353754282053699331L;
 
     /** @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 604d2166ee9b..6abd987a1724 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 = -6522139850075751098L;
+    private static final long serialVersionUID = -6522141850420238087L;
 
     /** @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 7d1d6e755c3c..339cd7a34e7c 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 = 7620287909264990021L;
+    private static final long serialVersionUID = 7620283336327893434L;
 
     /** @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 f3d45018ccbb..77ff72eb9515 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 = -7706456845850301782L;
+    private static final long serialVersionUID = -5771544267247752293L;
 }
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 511028e8a679..07bcd6f6e2e2 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 = 5533504755665427973L;
+    private static final long serialVersionUID = -3136663444921354851L;
 
     /** @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 051feaf34fcd..a17b09f44cea 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/server/Test/UnknownDerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1137108207203811378L;
+    private static final long serialVersionUID = 5146762354585810695L;
 }
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 a16ef08abb3d..c75e807f3dbe 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 = 6029009134816612156L;
+    private static final long serialVersionUID = 4481592101954014854L;
 
     /** @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 4b4f09b83e23..cce4afea3f6c 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6583857433546545008L;
+    private static final long serialVersionUID = 7681265418320705866L;
 }
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 58973a04ec20..108bace0f122 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 = -4863090047529070849L;
+    private static final long serialVersionUID = 3693795732516439397L;
 
     /** @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 31f72be6cac7..401ecd08b75e 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 = 8794654985116909724L;
+    private static final long serialVersionUID = 6372150591578038534L;
 
     /** @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 6a1b463e2ec9..5f19a8c94365 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 = 4700436327933700339L;
+    private static final long serialVersionUID = 2974182537733000115L;
 
     /** @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 1f099dac1769..0682898b638b 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 128624038916423467L;
+    private static final long serialVersionUID = -3000163412085021948L;
 }
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 b79bcb6f9a93..d4f361a16a0f 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 = -7655919140389330956L;
+    private static final long serialVersionUID = -7655923247507362644L;
 
     /** @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 8c8177b4e13c..1af186a4a099 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 = -2271132719477825862L;
+    private static final long serialVersionUID = -2271128777951876052L;
 
     /** @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 2f9250a174e8..88df4de7b58d 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 = 4147532620565467154L;
+    private static final long serialVersionUID = 4147528513495154616L;
 
     /** @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 fe8a535d7307..5bb0484e18e8 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 = 481704908499640477L;
+    private static final long serialVersionUID = 481708976411673719L;
 
     /** @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 bad25fef8d28..1488cd916f32 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 = 643078324504865946L;
+    private static final long serialVersionUID = 643079706491842508L;
 
     /** @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 806354d1e719..563118134c97 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 = -2438003491570383814L;
+    private static final long serialVersionUID = -2438007763771062154L;
 
     /** @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 32c4c3bc8b66..9e9aaa466a96 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 = -5707369935652060067L;
+    private static final long serialVersionUID = -1011493474543832230L;
 
     /** @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 71b55cf5b8c6..293a588a1973 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 = -8813705634752065730L;
+    private static final long serialVersionUID = -8813709708220177432L;
 
     /** @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 2a7d32c15c57..64d7e72b5c29 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/PSUnknownException.java
@@ -61,5 +61,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4410695471638194615L;
+    private static final long serialVersionUID = 4410691398363228979L;
 }
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 3e0dbe54c229..7f57d117a7ab 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 = 3651524713929887802L;
+    private static final long serialVersionUID = 3651528655484215415L;
 
     /** @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 95e17ca3b2c6..9ae62ba24270 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 = 8804375118460546207L;
+    private static final long serialVersionUID = 8804376500463296338L;
 
     /** @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 5132030d8df3..c2ded2c884f4 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 = -4989065551877068454L;
+    private static final long serialVersionUID = -4989066900023609065L;
 
     /** @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 8da323ab328b..3471b0afc580 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 = -5353757177356928471L;
+    private static final long serialVersionUID = -5353761284380875676L;
 
     /** @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 6aa861fbf5ad..4a34bbda7e83 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 = -6522133733683568558L;
+    private static final long serialVersionUID = -6522135076591318885L;
 
     /** @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 8948b5034401..340d709f5a43 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 = 7620285925569931601L;
+    private static final long serialVersionUID = 7620287472820515608L;
 
     /** @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 1e2c4bcd949e..31f58a0f3c93 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 = 1887675125559253784L;
+    private static final long serialVersionUID = -3972172762045939952L;
 }
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 07d3394466c8..54ff2352e03d 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 = -3317145413907684091L;
+    private static final long serialVersionUID = 141696120918485548L;
 
     /** @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 bef0906fd118..0847e5b1ab28 100644
--- a/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/slicing/objects/test/Ice/slicing/objects/serverAMD/Test/UnknownDerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2408036644066659787L;
+    private static final long serialVersionUID = -3674480256648575752L;
 }
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 fefea97db16f..4cb395799e4b 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 = -6600091592072446130L;
+    private static final long serialVersionUID = 8002505700222685620L;
 }
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 ac9a6ee8acf6..02019307e8fa 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 = -3067588826008197242L;
+    private static final long serialVersionUID = 2700135962592765116L;
 
     /** @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 820193ae5608..d55a7ad4726c 100644
--- a/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java
+++ b/slice2java/java/test/src/main/java/test/Ice/stream/test/Ice/stream/Test/MyException.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734225238771398582L;
+    private static final long serialVersionUID = 5734225415815155852L;
 }
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 5cbf0ffccfd0..d8510da0f4f2 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 = 4986232116929392217L;
+    private static final long serialVersionUID = -6116924828430798557L;
 
     /** @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 3d497cef2405..d189cc23b675 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 = 5820230196639974512L;
+    private static final long serialVersionUID = 5516868750155787888L;
 }
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 c666329a704d..b87c3b1f6fd2 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 = -8338122975322418070L;
+    private static final long serialVersionUID = 3990284757461893908L;
 
     /** @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 9eed469775a4..7def8947c7b8 100644
--- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/Clash/Ex.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2787992694638774230L;
+    private static final long serialVersionUID = -7483192632525168801L;
 }
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 cbbf19f36fe7..38aa18456c5a 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 = 8084914416620806420L;
+    private static final long serialVersionUID = -4780651561693518660L;
 }
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 4e337988573f..764839c8026d 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 = -943493151302402051L;
+    private static final long serialVersionUID = -943479388054960828L;
 }
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 551145fa59d2..210b59ab2994 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 = -2923325760670249468L;
+    private static final long serialVersionUID = 5893235237495300913L;
 
     /** @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 205141703095..d7a8fca0d238 100644
--- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java
+++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_hashCode.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2944654611860796282L;
+    private static final long serialVersionUID = -2944657464786556609L;
 }
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 b6893a6d1e56..f346648f690f 100644
--- a/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java
+++ b/slice2java/java/test/src/main/java/test/Slice/escape/test/Slice/escape/_abstract/_import.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1760842209199135287L;
+    private static final long serialVersionUID = 7283524587506805303L;
 }
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 911bc1b4b32f..a22ebe384d07 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 = 4000996869356999614L;
+    private static final long serialVersionUID = 8481866758909849726L;
 
     /** @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 59de3ed83582..74630d0b94e3 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 = 6534324179954758829L;
+    private static final long serialVersionUID = -4482640575648470644L;
 
     /** @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 5835c777d621..4834c0c401cf 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 = -5131430641491679905L;
+    private static final long serialVersionUID = -1840355964380478433L;
 
     /** @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 045f0444c20b..45de72443bbc 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 = -3172273186395186379L;
+    private static final long serialVersionUID = -3172274753028705612L;
 
     /** @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 c85d55234f61..0925386bb9c9 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 = -5542866232941916366L;
+    private static final long serialVersionUID = -5542862018803871757L;
 }
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 d9929855ee9b..a8af7394977e 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 = 5890355445501439144L;
+    private static final long serialVersionUID = -5849475816842427320L;
 }
diff --git a/slice2java/js/test/Glacier2/router/Test/CallbackException.java b/slice2java/js/test/Glacier2/router/Test/CallbackException.java
index 9e6969da89d5..eed118086306 100644
--- a/slice2java/js/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/js/test/Glacier2/router/Test/CallbackException.java
@@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3365255475694122665L;
+    private static final long serialVersionUID = 193725940569929943L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Base.java b/slice2java/js/test/Ice/defaultValue/Test/Base.java
index 04cec9fe3461..7f65193c447f 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 = 2276140070638812311L;
+    private static final long serialVersionUID = 9149446116016371874L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java
index 67054f5cdfb0..3c3c438c6ddb 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/BaseEx.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5367284302581038429L;
+    private static final long serialVersionUID = 285704726783263318L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaults.java
index cf54e3e141a3..20b79e06ef9e 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 = -48778777441854186L;
+    private static final long serialVersionUID = 8928781523702161803L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index d6f4dfaadcd3..6b3edf80999e 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 = 3735711638551317235L;
+    private static final long serialVersionUID = 1693115956512482595L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Derived.java b/slice2java/js/test/Ice/defaultValue/Test/Derived.java
index 116de547b06b..856efe12ad50 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 = -5628393901538739122L;
+    private static final long serialVersionUID = -5164914699774878650L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java
index 0e5acc7adcb9..ae80c6e62d61 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/DerivedEx.java
@@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1336945240222433415L;
+    private static final long serialVersionUID = 7031160053409618161L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index d28f1db17183..1967728baf64 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 14895000954750194L;
+    private static final long serialVersionUID = 7640771238784554223L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index a94081818c64..9d14900a862f 100644
--- a/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
+++ b/slice2java/js/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
@@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4981650888274252669L;
+    private static final long serialVersionUID = -8508326653110174381L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/js/test/Ice/defaultValue/Test/InnerStruct.java
index db2376e8697b..c117e455f490 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 = 5127395139981482290L;
+    private static final long serialVersionUID = 5127391944988492692L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct1.java b/slice2java/js/test/Ice/defaultValue/Test/Struct1.java
index 46fad173aa37..92e0143b21f0 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 = 8067772085450192057L;
+    private static final long serialVersionUID = -3233036129991732924L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct2.java b/slice2java/js/test/Ice/defaultValue/Test/Struct2.java
index 4bedbb1e5a95..2dc9d8ea071c 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 = 7693715227854925885L;
+    private static final long serialVersionUID = -1033676268984676645L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/Struct3.java b/slice2java/js/test/Ice/defaultValue/Test/Struct3.java
index 4352f6742125..bee999e7ec52 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 = -590191528805911621L;
+    private static final long serialVersionUID = 8776859622719671110L;
 }
diff --git a/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/js/test/Ice/defaultValue/Test/StructNoDefaults.java
index 62a9aa29ab69..85e41c6a6879 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 = -3420225175769880483L;
+    private static final long serialVersionUID = 6122500057611032496L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/A.java b/slice2java/js/test/Ice/exceptions/Test/A.java
index 3d0a772979c6..2493df500306 100644
--- a/slice2java/js/test/Ice/exceptions/Test/A.java
+++ b/slice2java/js/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823737002427024762L;
+    private static final long serialVersionUID = 7823741975956176448L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/B.java b/slice2java/js/test/Ice/exceptions/Test/B.java
index a28b3c94e21a..b69eda519338 100644
--- a/slice2java/js/test/Ice/exceptions/Test/B.java
+++ b/slice2java/js/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861418896089451462L;
+    private static final long serialVersionUID = -3861419377716540288L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/C.java b/slice2java/js/test/Ice/exceptions/Test/C.java
index 6d1caacf46b5..6b2fb357bccc 100644
--- a/slice2java/js/test/Ice/exceptions/Test/C.java
+++ b/slice2java/js/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080690693629810042L;
+    private static final long serialVersionUID = 1080695667158961728L;
 }
diff --git a/slice2java/js/test/Ice/exceptions/Test/D.java b/slice2java/js/test/Ice/exceptions/Test/D.java
index 18a784ba1e95..7575aa00d2dc 100644
--- a/slice2java/js/test/Ice/exceptions/Test/D.java
+++ b/slice2java/js/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780373372012626746L;
+    private static final long serialVersionUID = 4780372890385537920L;
 }
diff --git a/slice2java/js/test/Ice/inheritance/Test/MC/A.java b/slice2java/js/test/Ice/inheritance/Test/MC/A.java
index 6000adfc7d24..19aee820287b 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 = 954223184780476504L;
+    private static final long serialVersionUID = 954230006244647798L;
 
     /** @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 a3d6bf70124b..acdefef7568a 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 = 1339630865749407042L;
+    private static final long serialVersionUID = 1339643307659888748L;
 
     /** @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 e38166e68556..310b71dd02b4 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 = -2729314710551336000L;
+    private static final long serialVersionUID = -2729307889104990482L;
 
     /** @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 c15c26ab7cd7..ea6ed6078ba3 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 = -3435400993566108346L;
+    private static final long serialVersionUID = -3435399461976741272L;
 
     /** @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 c834f1bcfaa5..3fbd4b62903e 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 = -836179033024779425L;
+    private static final long serialVersionUID = -836185854314727247L;
 
     /** @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 895a253be5fd..3c32b1e14153 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 = 1132525453879961442L;
+    private static final long serialVersionUID = 1132526649848793484L;
 
     /** @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 c75ea901df9a..44c1b10c30fd 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 = -6335557762574748704L;
+    private static final long serialVersionUID = -6335551276748650738L;
 
     /** @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 f3265a17140a..bb0c9ac733fa 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 = -4007406909054093722L;
+    private static final long serialVersionUID = -4007416623406376312L;
 
     /** @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 7f821a52a0cb..6a44b0711855 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 = 991427923048714718L;
+    private static final long serialVersionUID = 991429454655907568L;
 
     /** @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 ffde22e448d3..191ebf91ebf9 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 = -2880342371232062334L;
+    private static final long serialVersionUID = -2880329929165182804L;
 
     /** @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 3ad7f69bd931..e505581df28f 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 = -8808270252604826624L;
+    private static final long serialVersionUID = -8808263431011283154L;
 
     /** @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 b4adb6cda084..7f858186ca16 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 = -771861029990132346L;
+    private static final long serialVersionUID = -771859498244367448L;
 
     /** @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 ba9dc7910b9e..f40691c0ddfb 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 = 6566362308439110109L;
+    private static final long serialVersionUID = 6566349866675826227L;
 
     /** @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 7f1b7e8a7fae..77ca7c90e002 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 = 6983796748539851682L;
+    private static final long serialVersionUID = 6983809185298409420L;
 
     /** @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 934c1ecf932a..5c70b8c990f8 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 = -1175216651957148128L;
+    private static final long serialVersionUID = -1175220745993328562L;
 
     /** @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 57d3aec3d5fa..2320bd37f4af 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 = -3279720827411180122L;
+    private static final long serialVersionUID = -3279719300973737016L;
 
     /** @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 32c8ac1bdde7..48b2d48c1d1f 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 = -4359177905328056740L;
+    private static final long serialVersionUID = -4359181994185000078L;
 
     /** @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 719057ae7cae..60660986b636 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 = 5904687653300795074L;
+    private static final long serialVersionUID = 5904700095211276780L;
 
     /** @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 e628162d079b..5deb47f91d7b 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 = 1835742077000052032L;
+    private static final long serialVersionUID = 1835748898446397550L;
 
     /** @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 b157f95ef8f8..c12b68321693 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 = -2252401646796425530L;
+    private static final long serialVersionUID = -2252400115207058456L;
 
     /** @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 534372399a57..00eb333f4b93 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 = -1203537785962795181L;
+    private static final long serialVersionUID = -1203533696912654659L;
 
     /** @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 385a41343f65..be9263f0e6b5 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 = -7537766577707323678L;
+    private static final long serialVersionUID = -7537765381738491636L;
 
     /** @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 7ceea8b17c56..3026bc29ce24 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 = 3440894279547517792L;
+    private static final long serialVersionUID = 3440900765373615758L;
 
     /** @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 48fb283ce552..4b446b55245e 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 = 9151102573849877990L;
+    private static final long serialVersionUID = 9151092859497595400L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/A.java b/slice2java/js/test/Ice/objects/Test/A.java
index 1c738aa15d62..a1a387237deb 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 = -5703575456295555109L;
+    private static final long serialVersionUID = 4594182816966237719L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/A1.java b/slice2java/js/test/Ice/objects/Test/A1.java
index 977c10c05203..4883f8b43708 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 = -5926746126873552910L;
+    private static final long serialVersionUID = -5926739205969639806L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/B.java b/slice2java/js/test/Ice/objects/Test/B.java
index 87991f6bcc79..225ae0f3910d 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 = -8890918652875412260L;
+    private static final long serialVersionUID = -8890911863535524113L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/B1.java b/slice2java/js/test/Ice/objects/Test/B1.java
index 7bdaddb443a5..beeac6e170b8 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 = -2312450321698163004L;
+    private static final long serialVersionUID = -6837824012201399548L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Base.java b/slice2java/js/test/Ice/objects/Test/Base.java
index efd10b4df7c7..e814398e6f03 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 = 3201329074114645998L;
+    private static final long serialVersionUID = -5250453449130647760L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/C.java b/slice2java/js/test/Ice/objects/Test/C.java
index 03f698c96ef5..7ef62e1d22a5 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 = -5922775575467366469L;
+    private static final long serialVersionUID = 1678003583587267275L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/COneMember.java b/slice2java/js/test/Ice/objects/Test/COneMember.java
index 29248190f388..a3def95644bc 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 = 3050977508963827831L;
+    private static final long serialVersionUID = 3050965099031002918L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/CTwoMembers.java b/slice2java/js/test/Ice/objects/Test/CTwoMembers.java
index 65d307c1f2ab..621dd9472565 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 = -8063195135924329701L;
+    private static final long serialVersionUID = 768037452911711899L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/D.java b/slice2java/js/test/Ice/objects/Test/D.java
index 44dc90367c6c..78b75f0c282d 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 = 8803850777895244707L;
+    private static final long serialVersionUID = -6113083519266862916L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/D1.java b/slice2java/js/test/Ice/objects/Test/D1.java
index c2a551708118..a85451734837 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 = 3806119470541863811L;
+    private static final long serialVersionUID = 2604335149102363971L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/E.java b/slice2java/js/test/Ice/objects/Test/E.java
index 3b99a7b65448..41d53c301aae 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 = 1145753871971777214L;
+    private static final long serialVersionUID = -7693793455378363338L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/EBase.java b/slice2java/js/test/Ice/objects/Test/EBase.java
index cecf9971e5b2..040340757bd3 100644
--- a/slice2java/js/test/Ice/objects/Test/EBase.java
+++ b/slice2java/js/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5356317013145975694L;
+    private static final long serialVersionUID = -4626318982328738866L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/EDerived.java b/slice2java/js/test/Ice/objects/Test/EDerived.java
index 31b2b35de966..db23ae6d8168 100644
--- a/slice2java/js/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/js/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1668290728182342546L;
+    private static final long serialVersionUID = -4837976943909223214L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/EOneMember.java b/slice2java/js/test/Ice/objects/Test/EOneMember.java
index 369abf779681..dd21a73325c2 100644
--- a/slice2java/js/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/js/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225292321684231624L;
+    private static final long serialVersionUID = -6225280116071396759L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java
index bd3fcd298f16..947c32bdd8c5 100644
--- a/slice2java/js/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/js/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8356668354036781164L;
+    private static final long serialVersionUID = 5191010156350538516L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/F.java b/slice2java/js/test/Ice/objects/Test/F.java
index 24f46b3ffb18..adbb4a0a4e26 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 = -714893641906291887L;
+    private static final long serialVersionUID = -4927464926395631343L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/F1.java b/slice2java/js/test/Ice/objects/Test/F1.java
index 9c410dd5af6e..0b09b33ce2cb 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 = 6192365805916026300L;
+    private static final long serialVersionUID = 6192374138292356648L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/F3.java b/slice2java/js/test/Ice/objects/Test/F3.java
index 0e9682d1d68b..55a008ef068c 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 = -5889903049330469019L;
+    private static final long serialVersionUID = -3216691190450435537L;
 
     /** @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 0780d7d5b8f9..7cf6abbce7bb 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 = -1425261119618758154L;
+    private static final long serialVersionUID = -1425254159814167419L;
 
     /** @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 a238e688f9f6..967e3f1b955d 100644
--- a/slice2java/js/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/js/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337229362441396277L;
+    private static final long serialVersionUID = -2337225212872531525L;
 }
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 ed72836e003c..1d943d528bac 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 = -1298679353705363851L;
+    private static final long serialVersionUID = -1298688898874410829L;
 
     /** @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 395024973b8c..88107ed28d1a 100644
--- a/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/js/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842238597919881071L;
+    private static final long serialVersionUID = 1842226227016394975L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/K.java b/slice2java/js/test/Ice/objects/Test/K.java
index 0b03b17ec369..d7a1b3882485 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 = 4645161747239239798L;
+    private static final long serialVersionUID = 4645160712752317745L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/L.java b/slice2java/js/test/Ice/objects/Test/L.java
index 985310d5d2d1..c19da28d285c 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 = 6629739293367057913L;
+    private static final long serialVersionUID = 6629743233574538057L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/M.java b/slice2java/js/test/Ice/objects/Test/M.java
index 5b212b275c2b..3b8d38a4a73c 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 = -8088097085702530468L;
+    private static final long serialVersionUID = -8088101506378968053L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/Recursive.java b/slice2java/js/test/Ice/objects/Test/Recursive.java
index 62b94292842e..1b27f676c3c8 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 = 3617877512043038404L;
+    private static final long serialVersionUID = 3617887387880605471L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/objects/Test/S.java b/slice2java/js/test/Ice/objects/Test/S.java
index d3867fec972e..b2d36a17a4f6 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 = 481771859163371594L;
+    private static final long serialVersionUID = 481773198504692218L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/SOneMember.java b/slice2java/js/test/Ice/objects/Test/SOneMember.java
index 6ca3b09d6730..70beef3a94c9 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 = 6227753500897522606L;
+    private static final long serialVersionUID = 6227749395219854335L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/STwoMembers.java b/slice2java/js/test/Ice/objects/Test/STwoMembers.java
index 58339156d9a0..e816b0c49ee7 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 = -6261295411668064510L;
+    private static final long serialVersionUID = 5856667252360950402L;
 }
diff --git a/slice2java/js/test/Ice/objects/Test/StructKey.java b/slice2java/js/test/Ice/objects/Test/StructKey.java
index 597699d89bbd..436a65d2d333 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 = 7698770319957359986L;
+    private static final long serialVersionUID = -3828221639719697670L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/AnotherStruct.java b/slice2java/js/test/Ice/operations/Test/AnotherStruct.java
index 6c290400637e..a862655dfcef 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 = 2723849498458555953L;
+    private static final long serialVersionUID = 2723842798335289720L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/MyClass1.java b/slice2java/js/test/Ice/operations/Test/MyClass1.java
index 403bc70b8d6f..863da8327b76 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 = -2761508193332129084L;
+    private static final long serialVersionUID = -3083228514555050149L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct.java b/slice2java/js/test/Ice/operations/Test/MyStruct.java
index a1eb22de86e3..207f751ba1cc 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 = -9168017843403495235L;
+    private static final long serialVersionUID = -4668565877530649187L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/MyStruct1.java b/slice2java/js/test/Ice/operations/Test/MyStruct1.java
index 6a5e70dc49e1..9a239f7def4e 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 = -3015285620416021907L;
+    private static final long serialVersionUID = 7931608376274908978L;
 }
diff --git a/slice2java/js/test/Ice/operations/Test/Structure.java b/slice2java/js/test/Ice/operations/Test/Structure.java
index 18c99aa64886..00764fc58598 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 = 6298396478234892509L;
+    private static final long serialVersionUID = 1237822415101956211L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/A.java b/slice2java/js/test/Ice/optional/Test/A.java
index e0f733c8eb8b..90ec312f4728 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 = -6732018240697636208L;
+    private static final long serialVersionUID = -6831456273654467312L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/B.java b/slice2java/js/test/Ice/optional/Test/B.java
index 22054a471aaa..f7822f2da26c 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 = -4467064440902071453L;
+    private static final long serialVersionUID = -8095352915392437213L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/C.java b/slice2java/js/test/Ice/optional/Test/C.java
index 65b056a4f863..b00f68142067 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 = -5853167276976954115L;
+    private static final long serialVersionUID = 4968661035110480765L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/DerivedException.java b/slice2java/js/test/Ice/optional/Test/DerivedException.java
index 113afe156581..6571ff64a081 100644
--- a/slice2java/js/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/js/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7439884490987005985L;
+    private static final long serialVersionUID = 4619303864327780947L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/E.java b/slice2java/js/test/Ice/optional/Test/E.java
index 07b7f5a189b4..389f0be1c4cb 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 = -1850730986825821998L;
+    private static final long serialVersionUID = -1850744199821490505L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/F.java b/slice2java/js/test/Ice/optional/Test/F.java
index 7aa5ecbb6576..d44ce8c6a37c 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 = -6430490072736093023L;
+    private static final long serialVersionUID = -6430498995657972156L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/FixedStruct.java b/slice2java/js/test/Ice/optional/Test/FixedStruct.java
index 16a20ac61be6..233f70e737db 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 = 1569609675488233481L;
+    private static final long serialVersionUID = 1569603235017411272L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/G.java b/slice2java/js/test/Ice/optional/Test/G.java
index 60696890c9bf..074f76218f29 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 = 613584772944898579L;
+    private static final long serialVersionUID = -7450058439025988781L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/G1.java b/slice2java/js/test/Ice/optional/Test/G1.java
index 33d16cfa6f81..ecfaa096387b 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 = 7339787377465487023L;
+    private static final long serialVersionUID = 7339782422119730525L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/G2.java b/slice2java/js/test/Ice/optional/Test/G2.java
index cbf8e597490e..a3051f80c426 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 = 3824559626502982961L;
+    private static final long serialVersionUID = 3824546413521736905L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/MultiOptional.java b/slice2java/js/test/Ice/optional/Test/MultiOptional.java
index 085289d72bf8..c8f80dcbe41b 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 = 2363198381548898003L;
+    private static final long serialVersionUID = 7792563332229860787L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/OneOptional.java b/slice2java/js/test/Ice/optional/Test/OneOptional.java
index 00a8fcda0f1c..eba24296e050 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 = -7219607437523294041L;
+    private static final long serialVersionUID = -7219602482246490394L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/OptionalException.java b/slice2java/js/test/Ice/optional/Test/OptionalException.java
index 64fe8c5a0eeb..31d8116ed287 100644
--- a/slice2java/js/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/js/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 235601632185009432L;
+    private static final long serialVersionUID = 2403470184724858942L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/js/test/Ice/optional/Test/OptionalWithCustom.java
index 9cb81187584e..8a0d0a1ba98a 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 = 3346222301707987259L;
+    private static final long serialVersionUID = -2357835906298146501L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/optional/Test/RequiredException.java b/slice2java/js/test/Ice/optional/Test/RequiredException.java
index a1cfd1d3921c..c8610ebd7215 100644
--- a/slice2java/js/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/js/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894241400771536422L;
+    private static final long serialVersionUID = 2894244543084049684L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/SmallStruct.java b/slice2java/js/test/Ice/optional/Test/SmallStruct.java
index 3c5e03a6c5d8..6f0ee13845a3 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 = 6700996121311574559L;
+    private static final long serialVersionUID = 6700981583230588257L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/VarStruct.java b/slice2java/js/test/Ice/optional/Test/VarStruct.java
index 7077db71fb24..d7abe86b72da 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 = -1912281490118674393L;
+    private static final long serialVersionUID = -1912286445464430891L;
 }
diff --git a/slice2java/js/test/Ice/optional/Test/WD.java b/slice2java/js/test/Ice/optional/Test/WD.java
index e98b656f7724..5dfb1cfae891 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 = -5223748474234979160L;
+    private static final long serialVersionUID = -8817311699548929989L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C.java b/slice2java/js/test/Ice/scope/Test/C.java
index 92c287544394..3bf3d22dcea7 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 = -5190250791782265218L;
+    private static final long serialVersionUID = -5190250149999503976L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C1.java b/slice2java/js/test/Ice/scope/Test/C1.java
index 2e69212d7c28..7dbe03a71bc3 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 = 8893236379076561535L;
+    private static final long serialVersionUID = 8893230282133468141L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/scope/Test/C2.java b/slice2java/js/test/Ice/scope/Test/C2.java
index 08eb884fb8d3..4b1ba539176f 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 = 3323251989516003603L;
+    private static final long serialVersionUID = -2493488116476487757L;
 
     /** @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 83cca4ec13da..d3ba6f210829 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 = 4615626441827487007L;
+    private static final long serialVersionUID = 4615625800043705097L;
 
     /** @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 ddcc91665ef2..853e571fa8ab 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 = 672586675218248131L;
+    private static final long serialVersionUID = 672580578272140320L;
 
     /** @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 36745bfac432..b3ea11627657 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 = 8654436255629151650L;
+    private static final long serialVersionUID = 8654442352574122608L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/Inner/S.java b/slice2java/js/test/Ice/scope/Test/Inner/S.java
index 7b1d497fe0a3..7fa8505e427d 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 = 3694623537512292846L;
+    private static final long serialVersionUID = 3694613268979620924L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S.java b/slice2java/js/test/Ice/scope/Test/S.java
index d7530704f506..0cc7e324427c 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 = 2159695267432245072L;
+    private static final long serialVersionUID = 2159705535967286402L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S1.java b/slice2java/js/test/Ice/scope/Test/S1.java
index 5713df59b306..b43760b286fe 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 = 1241676695960186566L;
+    private static final long serialVersionUID = 1241671882582152276L;
 }
diff --git a/slice2java/js/test/Ice/scope/Test/S2.java b/slice2java/js/test/Ice/scope/Test/S2.java
index 77bad03bce15..b6bf3e78e6c6 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 = 6535985559789055466L;
+    private static final long serialVersionUID = -8124654806251592630L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java
index 2623db20ca24..b2aeb2bed4b4 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477023082667787375L;
+    private static final long serialVersionUID = -477016940453129214L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 6eda9b5e54d6..184da5eba166 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485209532627337015L;
+    private static final long serialVersionUID = 3485210209510687652L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index a1ec0fd61247..274dfad83819 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717377360907587014L;
+    private static final long serialVersionUID = 1717371218692928853L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index ea2d0f83e6a8..c802596a9fef 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384912376938152801L;
+    private static final long serialVersionUID = -7384917150210768628L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java
index e2ddc1cdb7fc..c0ee4a4b9e6b 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreserved.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2733708928631978150L;
+    private static final long serialVersionUID = -2733702799166123063L;
 }
diff --git a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
index 56fcfa13b30a..75007e7e1b1b 100644
--- a/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
+++ b/slice2java/js/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4528102258075669139L;
+    private static final long serialVersionUID = 4528108395124455424L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/B.java b/slice2java/js/test/Ice/slicing/objects/Test/B.java
index 865276db8554..78fdff5afa46 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 = -6032037805599265559L;
+    private static final long serialVersionUID = -8507277286914266148L;
 
     /** @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 50e9f9378877..0d249dc64954 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2724354502351838373L;
+    private static final long serialVersionUID = 2936000823961608976L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/js/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 0688e38cb71f..1ee8ab0cbcd2 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 = -6396997866722316105L;
+    private static final long serialVersionUID = -6396999172357208970L;
 
     /** @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 d36d5af4898e..216ec806de8a 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 = -9066888016533599250L;
+    private static final long serialVersionUID = -9066884065965873093L;
 
     /** @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 d74cbe8f80b3..5379b842d7a6 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 = 174578687894779658L;
+    private static final long serialVersionUID = 5802185306781530527L;
 
     /** @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 2a7ed3af3c47..0ffc2ffe9fe7 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 = 6313829880142947656L;
+    private static final long serialVersionUID = 8429405174959295325L;
 
     /** @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 e498ea30ec8c..0ed14f64d80d 100644
--- a/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/js/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3454982062671350538L;
+    private static final long serialVersionUID = 7547739922109686995L;
 }
diff --git a/slice2java/js/test/Ice/slicing/objects/Test/Forward.java b/slice2java/js/test/Ice/slicing/objects/Test/Forward.java
index 4670f454df0a..5d8ab8c29026 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 = -7655927298819977983L;
+    private static final long serialVersionUID = -7655925954389675422L;
 
     /** @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 a0bfe01747a4..8b6037f0c609 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 = -2271124726384105335L;
+    private static final long serialVersionUID = -2271126236154978692L;
 
     /** @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 82c9b699e33c..b5f66cd03dbe 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 = 481713027774264409L;
+    private static final long serialVersionUID = 481711722223896140L;
 
     /** @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 c02ca188df05..ab488fb24392 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 = -4426882893548910857L;
+    private static final long serialVersionUID = -4426884364500764490L;
 
     /** @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 e9e5e951973f..f56d2c5beb10 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 = 850539733635490052L;
+    private static final long serialVersionUID = 850541199479688721L;
 
     /** @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 e49523d9534b..3418f6f39064 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 = -4328908274724722587L;
+    private static final long serialVersionUID = -4328901309824651727L;
 
     /** @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 b4358956e3a1..1b7b1df6e71e 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 = -5081806364785330794L;
+    private static final long serialVersionUID = -5081815974658630707L;
 
     /** @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 8daca2b63395..9dfe5e98ecb4 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 = 643086400403498025L;
+    private static final long serialVersionUID = 643082245709044732L;
 
     /** @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 49cbe9f61514..923c818cf67c 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 = -2438000904836270427L;
+    private static final long serialVersionUID = -2438010305567657283L;
 
     /** @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 6055b1307366..bef8f25c1393 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 = 3651532706904233439L;
+    private static final long serialVersionUID = 3651531197099206916L;
 
     /** @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 1a23bc2dbd69..60a8285014ef 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 = 8804372283918830330L;
+    private static final long serialVersionUID = 8804379039495003425L;
 
     /** @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 57182f4d653e..859d17b4a630 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 = -5353754425469160308L;
+    private static final long serialVersionUID = -5353763991303209769L;
 
     /** @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 ab80f7fc6451..3a36771ec1b5 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 = -6522141770446807754L;
+    private static final long serialVersionUID = -6522137654536114539L;
 
     /** @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 123927ea381a..28d693e98ad7 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 = 7620283256147719669L;
+    private static final long serialVersionUID = 7620290177143091478L;
 
     /** @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 0b017e259314..bbfa0641da2c 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 = -8270280357466863918L;
+    private static final long serialVersionUID = -438460569429652524L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/LargeStruct.java b/slice2java/js/test/Ice/stream/Test/LargeStruct.java
index bdf2f1650fbe..e90198f7cd36 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 = -1707171032764892454L;
+    private static final long serialVersionUID = 3955515013394965210L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/MyClass.java b/slice2java/js/test/Ice/stream/Test/MyClass.java
index 86c3a72baa91..54c1ae1ecf9d 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 = 8717702987535791411L;
+    private static final long serialVersionUID = -330931703635140429L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Ice/stream/Test/MyException.java b/slice2java/js/test/Ice/stream/Test/MyException.java
index b5885fda72b5..47ab878fe61e 100644
--- a/slice2java/js/test/Ice/stream/Test/MyException.java
+++ b/slice2java/js/test/Ice/stream/Test/MyException.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734224737773116326L;
+    private static final long serialVersionUID = 5734227429187624320L;
 }
diff --git a/slice2java/js/test/Ice/stream/Test/OptionalClass.java b/slice2java/js/test/Ice/stream/Test/OptionalClass.java
index 73c74fb2822f..56023c75a743 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 = -9213653049419840266L;
+    private static final long serialVersionUID = -7977309270459483082L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/Clash/Cls.java b/slice2java/js/test/Slice/escape/Clash/Cls.java
index 70feb675521d..0ad447f6b83d 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 = -2278956511118685537L;
+    private static final long serialVersionUID = -2978899749232542727L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/Clash/Ex.java b/slice2java/js/test/Slice/escape/Clash/Ex.java
index 14f99173dbd5..f5487c4c0f8b 100644
--- a/slice2java/js/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/js/test/Slice/escape/Clash/Ex.java
@@ -63,5 +63,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6969369415582075977L;
+    private static final long serialVersionUID = 4487899629329440337L;
 }
diff --git a/slice2java/js/test/Slice/escape/Clash/St.java b/slice2java/js/test/Slice/escape/Clash/St.java
index cd1cac94f7b2..8a7d8b9d1d76 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 = 2519158324285261491L;
+    private static final long serialVersionUID = 752328340062581043L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/BaseMethods.java b/slice2java/js/test/Slice/escape/await/BaseMethods.java
index 2f80d955c3ee..84cf1b15919d 100644
--- a/slice2java/js/test/Slice/escape/await/BaseMethods.java
+++ b/slice2java/js/test/Slice/escape/await/BaseMethods.java
@@ -122,5 +122,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1389717962182697136L;
+    private static final long serialVersionUID = -7037238149255002588L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/_break.java b/slice2java/js/test/Slice/escape/await/_break.java
index 7be206cff11a..40f013cb1447 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 = -9079128092262540539L;
+    private static final long serialVersionUID = 1013944036807832113L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/_package.java b/slice2java/js/test/Slice/escape/await/_package.java
index ee7f7f35e951..91038196d57f 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 = -8012571149789849383L;
+    private static final long serialVersionUID = -6557120925288065703L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/await/delete.java b/slice2java/js/test/Slice/escape/await/delete.java
index 88e952e690d5..8ff71541dfdb 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 = 3161264751730572340L;
+    private static final long serialVersionUID = -6889275606381639872L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/escape/await/fixed.java b/slice2java/js/test/Slice/escape/await/fixed.java
index 72451a4f3ae4..0d88b2ffe4dd 100644
--- a/slice2java/js/test/Slice/escape/await/fixed.java
+++ b/slice2java/js/test/Slice/escape/await/fixed.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3808656538681462699L;
+    private static final long serialVersionUID = 3808658993842636255L;
 }
diff --git a/slice2java/js/test/Slice/escape/await/foreach.java b/slice2java/js/test/Slice/escape/await/foreach.java
index f873847488a8..98be99dc4bf8 100644
--- a/slice2java/js/test/Slice/escape/await/foreach.java
+++ b/slice2java/js/test/Slice/escape/await/foreach.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2943110488665068535L;
+    private static final long serialVersionUID = 6858459413076849097L;
 }
diff --git a/slice2java/js/test/Slice/macros/Test/Default.java b/slice2java/js/test/Slice/macros/Test/Default.java
index ae82ec7b69c4..40c4140cddc8 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 = -6845700529272828226L;
+    private static final long serialVersionUID = -4633875614669044162L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/js/test/Slice/macros/Test/NoDefault.java b/slice2java/js/test/Slice/macros/Test/NoDefault.java
index 3163412735b2..383aadd5aca3 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 = 5361450818145132639L;
+    private static final long serialVersionUID = 2179691045093759455L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Base.java b/slice2java/matlab/test/Ice/defaultValue/Test/Base.java
index 6ec6b4c89b0e..6a58739eae15 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 = -2566631024814926973L;
+    private static final long serialVersionUID = -1046805573273017261L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 2f56a4ff71e4..b059bfb6ee20 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 = 1242432316293474180L;
+    private static final long serialVersionUID = -289230833112461095L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/matlab/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index a9e9f16e31e6..288305d1bb35 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 = -3638175511100095016L;
+    private static final long serialVersionUID = 4770914494192436698L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java b/slice2java/matlab/test/Ice/defaultValue/Test/Derived.java
index fa27fb930ebc..6e80a7f3c092 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 = -6876662151373037818L;
+    private static final long serialVersionUID = 4275653936229922349L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/matlab/test/Ice/defaultValue/Test/InnerStruct.java
index 7eee76114caf..3f3d12b9f6f7 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 = 5127393720669310614L;
+    private static final long serialVersionUID = 5127387578605607314L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct1.java
index f9cbcaee8035..c1303bc3770e 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 = -613940698082142331L;
+    private static final long serialVersionUID = 4015815850038212574L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java b/slice2java/matlab/test/Ice/defaultValue/Test/Struct2.java
index 2f4a5e29fbf9..9d4f3ddc51c7 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 = 6471711577318423639L;
+    private static final long serialVersionUID = -1795076419297215297L;
 }
diff --git a/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/matlab/test/Ice/defaultValue/Test/StructNoDefaults.java
index f68619115467..983b6f2a6446 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 = -2113187057760863743L;
+    private static final long serialVersionUID = -3668029108607337637L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/A.java b/slice2java/matlab/test/Ice/exceptions/Test/A.java
index 37941374fe33..793cc0f7ab53 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/A.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823741106720705672L;
+    private static final long serialVersionUID = 7823745367346268893L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/B.java b/slice2java/matlab/test/Ice/exceptions/Test/B.java
index 20a92893fa60..801fa816f1b3 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/B.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861414626478949176L;
+    private static final long serialVersionUID = -3861410696473507427L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/C.java b/slice2java/matlab/test/Ice/exceptions/Test/C.java
index ce52cf44a8af..c377254ec2fb 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/C.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080694797923490952L;
+    private static final long serialVersionUID = 1080699058549054173L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/D.java b/slice2java/matlab/test/Ice/exceptions/Test/D.java
index 45c5bbc74ea8..a62edb24d8de 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/D.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780377641623129032L;
+    private static final long serialVersionUID = 4780381571628570781L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/E.java b/slice2java/matlab/test/Ice/exceptions/Test/E.java
index be6223d4e2f3..953f76dd84f7 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/E.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/E.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1876977516445147499L;
+    private static final long serialVersionUID = -1876968131432047782L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/F.java b/slice2java/matlab/test/Ice/exceptions/Test/F.java
index fdb616d92dde..103cce6bebd7 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/F.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/F.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 733474306169979414L;
+    private static final long serialVersionUID = 733475511020141529L;
 }
diff --git a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java
index dbbd9a48e9d6..73e19b01ef91 100644
--- a/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/matlab/test/Ice/exceptions/Test/Mod/A.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641407129718881508L;
+    private static final long serialVersionUID = -4641413459112837303L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/C1.java b/slice2java/matlab/test/Ice/objects/LocalTest/C1.java
index 90934c646a58..3d1869363447 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 = -8471298292629287979L;
+    private static final long serialVersionUID = -8471303107221848609L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB1.java
index dc18f2ece7cf..bf4a22cafe66 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 = 8898654003262306510L;
+    private static final long serialVersionUID = 8898649189887689374L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB2.java
index f896814b161f..47491f0b9e71 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 = 4040523562387519395L;
+    private static final long serialVersionUID = 4040522920605819985L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB3.java
index b225ba501032..f0778f3270ec 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 = 5383253260785163057L;
+    private static final long serialVersionUID = 5383248447412414268L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB4.java
index a2873e6f104c..7f128a96ed90 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 = 4057360736607677103L;
+    private static final long serialVersionUID = 4057366833553221312L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB5.java
index e74bf1635fa7..b6b1d411ff15 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 = -1044057933109432335L;
+    private static final long serialVersionUID = -1044053119735496015L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB6.java
index f92fffa48649..6dd2c10935d3 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 = -1862553191301987632L;
+    private static final long serialVersionUID = -1862548377920934120L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB7.java
index f0b145c3866d..89338b63051d 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 = -2187168202732617976L;
+    private static final long serialVersionUID = -2187162105790586294L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java b/slice2java/matlab/test/Ice/objects/LocalTest/CB8.java
index 890e160502f1..083d659e84f3 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 = 3042994274803870386L;
+    private static final long serialVersionUID = 8677895552970953232L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S1.java b/slice2java/matlab/test/Ice/objects/LocalTest/S1.java
index 28414c327465..887328c153a0 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 = -5145822922988788648L;
+    private static final long serialVersionUID = -5145822282418171966L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S2.java b/slice2java/matlab/test/Ice/objects/LocalTest/S2.java
index 09d7c080bafc..e8344de0746c 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 = 3347998725443451254L;
+    private static final long serialVersionUID = 3347992628501544742L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S3.java b/slice2java/matlab/test/Ice/objects/LocalTest/S3.java
index 889dd7ad1a83..9e8fd0083bba 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 = -9162148119031133767L;
+    private static final long serialVersionUID = -9162147477249647413L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S4.java b/slice2java/matlab/test/Ice/objects/LocalTest/S4.java
index b3f2e1e2ef3f..c0eb8733a5c0 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 = -2752857487952768307L;
+    private static final long serialVersionUID = -2752863584896819520L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S5.java b/slice2java/matlab/test/Ice/objects/LocalTest/S5.java
index c359f0980911..a754ed7d7ffe 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 = -6601214024578215755L;
+    private static final long serialVersionUID = -6601220121523539750L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S6.java b/slice2java/matlab/test/Ice/objects/LocalTest/S6.java
index 3e46fbb489aa..c20ed397a510 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 = 3216396365780818185L;
+    private static final long serialVersionUID = 3216397007555595209L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S7.java b/slice2java/matlab/test/Ice/objects/LocalTest/S7.java
index fbf4320852a2..6d1c79962137 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 = -3218146679875990518L;
+    private static final long serialVersionUID = -3218146038085052222L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/S8.java b/slice2java/matlab/test/Ice/objects/LocalTest/S8.java
index ff5e11bfbdf3..bd98eca09785 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 = 4560071074833578492L;
+    private static final long serialVersionUID = 4560075888208213950L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java b/slice2java/matlab/test/Ice/objects/LocalTest/StructKey.java
index cfe56252368b..1e0e2bfb1fe5 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 = -8868761853092609709L;
+    private static final long serialVersionUID = 4196844057939623315L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/A.java b/slice2java/matlab/test/Ice/objects/Test/A.java
index ae0e0540973e..bbe8a561ec99 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 = 8674927691807597917L;
+    private static final long serialVersionUID = -872757191588578626L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/A1.java b/slice2java/matlab/test/Ice/objects/Test/A1.java
index 2bef9ab1c830..890180d7b1e3 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 = -5926743374987721180L;
+    private static final long serialVersionUID = -5926741830232883283L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/B.java b/slice2java/matlab/test/Ice/objects/Test/B.java
index 8a3540fc26da..27fcb31061c0 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 = -8890910411784811832L;
+    private static final long serialVersionUID = -8890919816402821877L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/B1.java b/slice2java/matlab/test/Ice/objects/Test/B1.java
index 805b488b20fa..dc69159be711 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 = 6667393448907385604L;
+    private static final long serialVersionUID = 1613757170671705476L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Base.java b/slice2java/matlab/test/Ice/objects/Test/Base.java
index 076ce9f7ba99..edfa579066e8 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 = 8630770698076785244L;
+    private static final long serialVersionUID = -6410139568186302602L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/C.java b/slice2java/matlab/test/Ice/objects/Test/C.java
index f96fa10228d4..16c15e0ee6c2 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 = 6995098291667220591L;
+    private static final long serialVersionUID = -7972531523414675068L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/COneMember.java b/slice2java/matlab/test/Ice/objects/Test/COneMember.java
index 5970ef4b2988..e7f745961457 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 = 3050965066838153129L;
+    private static final long serialVersionUID = 3050973212326242954L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/CTwoMembers.java
index d0b1e341dc30..ac93175dec67 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 = 7166156427120507547L;
+    private static final long serialVersionUID = -5481030031967849829L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/D.java b/slice2java/matlab/test/Ice/objects/Test/D.java
index 3a433b464e22..ba8ac4b2a8db 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 = 501055646411358513L;
+    private static final long serialVersionUID = 852825655288869809L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/D1.java b/slice2java/matlab/test/Ice/objects/Test/D1.java
index 1c626e515392..c89c2e951d0b 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 = -7354802484049333693L;
+    private static final long serialVersionUID = -2183531714196450365L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/E.java b/slice2java/matlab/test/Ice/objects/Test/E.java
index fa171d7ef28e..11f17c83c94e 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 = 8259703097443717172L;
+    private static final long serialVersionUID = -2116714373307219164L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/EBase.java b/slice2java/matlab/test/Ice/objects/Test/EBase.java
index f89eac15d07c..0d6ff0ad11c7 100644
--- a/slice2java/matlab/test/Ice/objects/Test/EBase.java
+++ b/slice2java/matlab/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4729246911840710606L;
+    private static final long serialVersionUID = -5449211363012524466L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/EDerived.java b/slice2java/matlab/test/Ice/objects/Test/EDerived.java
index 4cd6c8259eec..36a062d78783 100644
--- a/slice2java/matlab/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/matlab/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1204389403484114898L;
+    private static final long serialVersionUID = 1298288036311182162L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java
index cb6d1253125e..e1e8c834601c 100644
--- a/slice2java/matlab/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/matlab/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225280249070333466L;
+    private static final long serialVersionUID = -6225288025046400891L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java
index 732a729929ae..45482f6bf1c6 100644
--- a/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/matlab/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8973905278348452076L;
+    private static final long serialVersionUID = -3878398746994792684L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/F.java b/slice2java/matlab/test/Ice/objects/Test/F.java
index bb4e6f97a3a0..e75782cb19d0 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 = -422971977555707439L;
+    private static final long serialVersionUID = -161475599128787503L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/F1.java b/slice2java/matlab/test/Ice/objects/Test/F1.java
index 8161afe29799..a102e20d2950 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 = 6192371898900227250L;
+    private static final long serialVersionUID = 6192373654077625364L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/F3.java b/slice2java/matlab/test/Ice/objects/Test/F3.java
index b05c0ae74474..bc2810afb88b 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 = 2075451708957525703L;
+    private static final long serialVersionUID = 8139611895339048391L;
 
     /** @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 f4ca63a47962..2a601e4115a2 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 = -1425258328831326366L;
+    private static final long serialVersionUID = -1425256822966797279L;
 
     /** @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 3ee96bb52108..fb0557604915 100644
--- a/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337226488853909859L;
+    private static final long serialVersionUID = -2337227878613900012L;
 }
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 471013540b49..c73788f465bc 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 = -1298687312977664561L;
+    private static final long serialVersionUID = -1298680837521569624L;
 
     /** @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 0d82d0049ee4..70a92387a6fe 100644
--- a/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/matlab/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842230225413645753L;
+    private static final long serialVersionUID = 1842234301279206832L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/K.java b/slice2java/matlab/test/Ice/objects/Test/K.java
index 7ff541fed915..95d7f1c2e5f5 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 = 4645160579861530844L;
+    private static final long serialVersionUID = 4645162910847176402L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/L.java b/slice2java/matlab/test/Ice/objects/Test/L.java
index a76adaeee849..54afc5854080 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 = 6629747247446944943L;
+    private static final long serialVersionUID = 6629735317029229478L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/M.java b/slice2java/matlab/test/Ice/objects/Test/M.java
index 0ee884a0299b..2b16c100216b 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 = -8088101363167711547L;
+    private static final long serialVersionUID = -8088093109428655410L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/Recursive.java b/slice2java/matlab/test/Ice/objects/Test/Recursive.java
index 6ba559733bb3..d8195d3dfe91 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 = 3617887224005975419L;
+    private static final long serialVersionUID = 3617878995939334602L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/objects/Test/S.java b/slice2java/matlab/test/Ice/objects/Test/S.java
index d9a1475d62b5..73a1a6a104e3 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 = 481774645092247324L;
+    private static final long serialVersionUID = 481770695638064405L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/SOneMember.java b/slice2java/matlab/test/Ice/objects/Test/SOneMember.java
index c16ed010efdc..bf9a7f12fd66 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 = 6227749262256885104L;
+    private static final long serialVersionUID = 6227757477251190419L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java b/slice2java/matlab/test/Ice/objects/Test/STwoMembers.java
index 5e9c4efc296b..6cd7ba469a3c 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 = -8448850430383498878L;
+    private static final long serialVersionUID = 7988300518864625794L;
 }
diff --git a/slice2java/matlab/test/Ice/objects/Test/StructKey.java b/slice2java/matlab/test/Ice/objects/Test/StructKey.java
index 43d4bfb27791..0d9a8d9f8fec 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 = 2838110778473708280L;
+    private static final long serialVersionUID = 6296046578844086376L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java b/slice2java/matlab/test/Ice/operations/Test/AnotherStruct.java
index 66e91fef8c67..bef7a447e083 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 = 2723850265751858355L;
+    private static final long serialVersionUID = 2723847530417984704L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyClass1.java b/slice2java/matlab/test/Ice/operations/Test/MyClass1.java
index 1d5c011eac2a..34bb993f2dfa 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 = 215571482837902429L;
+    private static final long serialVersionUID = 7273811047949162942L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct.java
index f0f3122ebebc..6e1b068ebd74 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 = 6439260784582227965L;
+    private static final long serialVersionUID = 3550567272162861949L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java b/slice2java/matlab/test/Ice/operations/Test/MyStruct1.java
index c7cb4e13ee46..3a134e4ed818 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 = -4890560135483453484L;
+    private static final long serialVersionUID = -7757569059625010313L;
 }
diff --git a/slice2java/matlab/test/Ice/operations/Test/Structure.java b/slice2java/matlab/test/Ice/operations/Test/Structure.java
index 539bf10b21ba..8e721a394823 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 = -3272291687917971934L;
+    private static final long serialVersionUID = -6955801579552220040L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/A.java b/slice2java/matlab/test/Ice/optional/Test/A.java
index 1753fbb03540..c375e360bac1 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 = -2434417410874065520L;
+    private static final long serialVersionUID = 8142046650800311824L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/B.java b/slice2java/matlab/test/Ice/optional/Test/B.java
index 96f796d7505c..98299f36b580 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 = 8928545473441163363L;
+    private static final long serialVersionUID = 7013194722455036451L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/C.java b/slice2java/matlab/test/Ice/optional/Test/C.java
index caaa0349b887..125fd9a0a332 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 = -1134356513276664067L;
+    private static final long serialVersionUID = 8921437988577283837L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java
index f3b2a7f77d4b..40ba5c404c7e 100644
--- a/slice2java/matlab/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/matlab/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5750629175910657563L;
+    private static final long serialVersionUID = 9140408273816988360L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/E.java b/slice2java/matlab/test/Ice/optional/Test/E.java
index 8e385d95ad42..083648932602 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 = -1850730236624218793L;
+    private static final long serialVersionUID = -1850734559026737161L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/F.java b/slice2java/matlab/test/Ice/optional/Test/F.java
index ff4524244bdb..5a01657e2995 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 = -6430490817932421212L;
+    private static final long serialVersionUID = -6430497410847110012L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java b/slice2java/matlab/test/Ice/optional/Test/FixedStruct.java
index e36e247ca669..272cfd95b4f9 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 = 1569617198369236373L;
+    private static final long serialVersionUID = 1569602097145959058L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/G.java b/slice2java/matlab/test/Ice/optional/Test/G.java
index fa74030170af..38f1212a367a 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 = 7756813702691555155L;
+    private static final long serialVersionUID = 6295146696383985171L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/G1.java b/slice2java/matlab/test/Ice/optional/Test/G1.java
index f400222806bb..a0dfc09afb3b 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 = 7339780019836984171L;
+    private static final long serialVersionUID = 7339784210944774470L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/G2.java b/slice2java/matlab/test/Ice/optional/Test/G2.java
index 09ee9b2e93f0..733cc91ec0b6 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 = 3824560376717149371L;
+    private static final long serialVersionUID = 3824556054302578656L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java b/slice2java/matlab/test/Ice/optional/Test/MultiOptional.java
index 4a0bc72cb4ee..84141c7ca63b 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 = -7416952102482616047L;
+    private static final long serialVersionUID = 8241962624742511032L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/OneOptional.java b/slice2java/matlab/test/Ice/optional/Test/OneOptional.java
index 9e72b4b71106..e43350bd4067 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 = -7219605535276743621L;
+    private static final long serialVersionUID = -7219598655691644228L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java
index cd53b9c19157..738ca244072c 100644
--- a/slice2java/matlab/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/matlab/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4628947640302579467L;
+    private static final long serialVersionUID = -3397308447781856807L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/matlab/test/Ice/optional/Test/OptionalWithCustom.java
index 3ec98a96f23f..8401542cfaa8 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 = 9123839696886592059L;
+    private static final long serialVersionUID = -6187196504051302277L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java
index 7b9b907985cd..4d606598640c 100644
--- a/slice2java/matlab/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/matlab/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894242140803599202L;
+    private static final long serialVersionUID = 2894238154175779343L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java b/slice2java/matlab/test/Ice/optional/Test/SmallStruct.java
index 0229b8f75d24..3fce69d665b2 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 = 6700995546430549101L;
+    private static final long serialVersionUID = 6700988623043606390L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/VarStruct.java b/slice2java/matlab/test/Ice/optional/Test/VarStruct.java
index 3930a8356e7a..6c70c4377de0 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 = -1912288847747177245L;
+    private static final long serialVersionUID = -1912284656638812978L;
 }
diff --git a/slice2java/matlab/test/Ice/optional/Test/WD.java b/slice2java/matlab/test/Ice/optional/Test/WD.java
index bcf491217d54..52af94c541a9 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 = 703105488589917680L;
+    private static final long serialVersionUID = 2413554161430111674L;
 
     /** @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 9dbe57957155..6288c0eb6350 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477021417889225025L;
+    private static final long serialVersionUID = -477021093816170722L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/BaseClass.java
index 492074328569..70c38bc1eab8 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 = -8435645134330560389L;
+    private static final long serialVersionUID = -8435644655262801958L;
 
     /** @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 ea2d51cc48c0..db517a7ed2f6 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485211192240171481L;
+    private static final long serialVersionUID = 3485211676473797304L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index daf824d95d9f..4dba8ca12e86 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717375014234946472L;
+    private static final long serialVersionUID = 1717375372056544329L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index ff475330f8b2..7ee9057fa2ec 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384920945752917071L;
+    private static final long serialVersionUID = -7384921143413664368L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java
index 1252f707e11e..3994343b4f3f 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreserved.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2733698321730142668L;
+    private static final long serialVersionUID = -2733699005001744683L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
index 476b07144bed..100528639014 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/KnownPreservedDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4528103917688359613L;
+    private static final long serialVersionUID = 4528104081619381404L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java
index 21066f8da572..e6a67d0ec6fc 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved1.java
@@ -62,5 +62,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6137353748314609329L;
+    private static final long serialVersionUID = 6137366344070336627L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java
index b88f1602c6c1..797d59af6e15 100644
--- a/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java
+++ b/slice2java/matlab/test/Ice/slicing/exceptions/Test/Preserved2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 751741421876932305L;
+    private static final long serialVersionUID = 751748562481158163L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java b/slice2java/matlab/test/Ice/slicing/exceptions/Test/PreservedClass.java
index a93091451182..66334ce03c9c 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 = -4272725980619866043L;
+    private static final long serialVersionUID = -4272726459687552732L;
 
     /** @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 9ef6cf2c776d..9bcf615cabc2 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 = 7988268655217149343L;
+    private static final long serialVersionUID = -6837109951361986335L;
 
     /** @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 d7b664e071ec..960660ff6938 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5695949657440932563L;
+    private static final long serialVersionUID = 6660701623428403885L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/matlab/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 6475d509dcd9..f88266a2fabd 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 = -6397006129539126476L;
+    private static final long serialVersionUID = -6397005322190070283L;
 
     /** @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 0d022b2e27ac..7ade0d251091 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 = -9066879753712472083L;
+    private static final long serialVersionUID = -9066883288495738152L;
 
     /** @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 64d9099599ac..e3a402a133d9 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 = -1684309662317779428L;
+    private static final long serialVersionUID = 4829440508520554946L;
 
     /** @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 404c11ad2bdb..cc848ea23544 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 = 4847031045480216798L;
+    private static final long serialVersionUID = 7456655251997020672L;
 
     /** @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 11b24b325d2b..236019cd9722 100644
--- a/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/matlab/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 9208137337433280872L;
+    private static final long serialVersionUID = 8465687623489777842L;
 }
diff --git a/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java b/slice2java/matlab/test/Ice/slicing/objects/Test/Forward.java
index 15eeb1e3ae9d..e6a237383d08 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 = -7655919036159700980L;
+    private static final long serialVersionUID = -7655926416666980935L;
 
     /** @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 c81a681ba514..fca405ab5c5c 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 = -2271132989205527622L;
+    private static final long serialVersionUID = -2271125443355030145L;
 
     /** @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 979e8be6779f..9bb42151a43e 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 = 481704764966516572L;
+    private static final long serialVersionUID = 481705572321380139L;
 
     /** @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 edf4455a1a0f..d67d746ef207 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 = -4426891156374921100L;
+    private static final long serialVersionUID = -4426884894159420619L;
 
     /** @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 e80ed093820d..a9c6e475b951 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 = 850542701433769217L;
+    private static final long serialVersionUID = 850536604529704630L;
 
     /** @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 445b329bdc30..387a88f7b3a2 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 = -4328900011912792986L;
+    private static final long serialVersionUID = -4328902097562119649L;
 
     /** @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 fb23e9c9850a..c906206a1b46 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 = -5081814627597536877L;
+    private static final long serialVersionUID = -5081815269376753108L;
 
     /** @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 1a95eb188ead..62ee0b3b8e2a 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 = 643078137582370858L;
+    private static final long serialVersionUID = 643077335232237663L;
 
     /** @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 aab8c159f6b4..b678a591efa1 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 = -2438003872629947354L;
+    private static final long serialVersionUID = -2438005798132510121L;
 
     /** @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 483bcf51f904..4968b9af2b87 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 = 3651524444092033754L;
+    private static final long serialVersionUID = 3651531990058580773L;
 
     /** @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 6b70cf6a6c5c..4198c9ee5bae 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 = 8804375251712644479L;
+    private static final long serialVersionUID = 8804374449478592256L;
 
     /** @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 10e524b19fec..a1bec490b815 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 = -5353757393262976631L;
+    private static final long serialVersionUID = -5353764773769990346L;
 
     /** @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 35b4001d2f77..ff3e9c37d230 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 = -6522133507639134486L;
+    private static final long serialVersionUID = -6522131587266403708L;
 
     /** @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 81a914bbb763..11cd1d03345c 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 = 7620286223946063401L;
+    private static final long serialVersionUID = 7620290877065012487L;
 
     /** @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 36145723d3e5..c020e55518bf 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 = -5240835614660345510L;
+    private static final long serialVersionUID = 2643281761619295420L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java b/slice2java/matlab/test/Slice/escape/classdef/_break/_try.java
index 8f959810d7c1..7cf03906432d 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 = 5136592349515650669L;
+    private static final long serialVersionUID = 693024374199943725L;
 
     /** @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 fceba289689e..7150fc64d62e 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 = 4755809891373486284L;
+    private static final long serialVersionUID = -5328180156232309912L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java
index 9fc010172004..d66f61ba5b96 100644
--- a/slice2java/matlab/test/Slice/escape/classdef/_break/global.java
+++ b/slice2java/matlab/test/Slice/escape/classdef/_break/global.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2421493373463625036L;
+    private static final long serialVersionUID = 2421492898103416174L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java b/slice2java/matlab/test/Slice/escape/classdef/_break/logical.java
index 772999b8544b..0771382b70fc 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 = -6398213916755571359L;
+    private static final long serialVersionUID = 7726043977575006684L;
 
     /** @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 4f67732280bc..b1954b8adc4d 100644
--- a/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java
+++ b/slice2java/matlab/test/Slice/escape/classdef/_break/persistent.java
@@ -89,5 +89,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4707360852512959855L;
+    private static final long serialVersionUID = 7326981352589418618L;
 }
diff --git a/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java b/slice2java/matlab/test/Slice/escape/classdef/_break/properties.java
index 1c7b5c8cf95c..8d884b0ba091 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 = -7198551275195096181L;
+    private static final long serialVersionUID = 976546188795156988L;
 
     /** @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 b4eedf9c09ff..78686651f8a7 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 = -1008949322597342227L;
+    private static final long serialVersionUID = -1008947233177996081L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Base.java b/slice2java/php/test/Ice/defaultValue/Test/Base.java
index 82d7db859d5f..1fb0be38a7cc 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 = 1612459269329650282L;
+    private static final long serialVersionUID = -3961519392130091107L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaults.java
index b193fabe331d..9b9ed60d90c5 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 = -2006850231361097783L;
+    private static final long serialVersionUID = 3595540354316275139L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/php/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 1aafcab470b4..a3e6175bf40a 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 = 8385310678021152646L;
+    private static final long serialVersionUID = -5372926133803600418L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Derived.java b/slice2java/php/test/Ice/defaultValue/Test/Derived.java
index dfe2a479b263..7a65fd967d75 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 = 5813900436280669451L;
+    private static final long serialVersionUID = -4642022248632586625L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/php/test/Ice/defaultValue/Test/InnerStruct.java
index b3698d69afa4..57f13b9063d3 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 = 5127390227325539329L;
+    private static final long serialVersionUID = 5127394788650063138L;
 }
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct1.java b/slice2java/php/test/Ice/defaultValue/Test/Struct1.java
index e9f99556c9ce..e73cb38c6445 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 = 4098223112156220833L;
+    private static final long serialVersionUID = 2548311604529473058L;
 }
diff --git a/slice2java/php/test/Ice/defaultValue/Test/Struct2.java b/slice2java/php/test/Ice/defaultValue/Test/Struct2.java
index a35f96f1912e..36a3745426f9 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 = 3093498816581498361L;
+    private static final long serialVersionUID = -807862174296692534L;
 }
diff --git a/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/php/test/Ice/defaultValue/Test/StructNoDefaults.java
index 457c96581ae5..6753dc5d86b2 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 = 9003399848355905347L;
+    private static final long serialVersionUID = -2455365752796596109L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/A.java b/slice2java/php/test/Ice/exceptions/Test/A.java
index 8288cb0a7c9a..5c6719b38f70 100644
--- a/slice2java/php/test/Ice/exceptions/Test/A.java
+++ b/slice2java/php/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823741895880418566L;
+    private static final long serialVersionUID = 7823744499332152346L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/B.java b/slice2java/php/test/Ice/exceptions/Test/B.java
index 22b8db66eda4..948db85bdf0c 100644
--- a/slice2java/php/test/Ice/exceptions/Test/B.java
+++ b/slice2java/php/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861419457792297914L;
+    private static final long serialVersionUID = -3861405944023761958L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/C.java b/slice2java/php/test/Ice/exceptions/Test/C.java
index 99a6ef3c1d3b..b662c5bfd4de 100644
--- a/slice2java/php/test/Ice/exceptions/Test/C.java
+++ b/slice2java/php/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080695587083203846L;
+    private static final long serialVersionUID = 1080698190534937626L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/D.java b/slice2java/php/test/Ice/exceptions/Test/D.java
index 831f4049e32a..5706e4240a8c 100644
--- a/slice2java/php/test/Ice/exceptions/Test/D.java
+++ b/slice2java/php/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780372810309780294L;
+    private static final long serialVersionUID = 4780386324078316250L;
 }
diff --git a/slice2java/php/test/Ice/exceptions/Test/Thrower.java b/slice2java/php/test/Ice/exceptions/Test/Thrower.java
index 3cb9229246a2..39167db50373 100644
--- a/slice2java/php/test/Ice/exceptions/Test/Thrower.java
+++ b/slice2java/php/test/Ice/exceptions/Test/Thrower.java
@@ -25,8 +25,8 @@ void throwAasA(int a, com.zeroc.Ice.Current current)
         throws A;
 
     void throwAorDasAorD(int a, com.zeroc.Ice.Current current)
-        throws A,
-               D;
+        throws D,
+               A;
 
     void throwBasA(int a, int b, com.zeroc.Ice.Current current)
         throws A;
diff --git a/slice2java/php/test/Ice/exceptions/Test/ThrowerPrx.java b/slice2java/php/test/Ice/exceptions/Test/ThrowerPrx.java
index 2d05231f46f8..46db1bf5ac49 100644
--- a/slice2java/php/test/Ice/exceptions/Test/ThrowerPrx.java
+++ b/slice2java/php/test/Ice/exceptions/Test/ThrowerPrx.java
@@ -143,25 +143,25 @@ default com.zeroc.Ice.OutgoingAsync<Void> _iceI_throwAasAAsync(int iceP_a, java.
     };
 
     default void throwAorDasAorD(int a)
-        throws A,
-               D
+        throws D,
+               A
     {
         throwAorDasAorD(a, com.zeroc.Ice.ObjectPrx.noExplicitContext);
     }
 
     default void throwAorDasAorD(int a, java.util.Map<String, String> context)
-        throws A,
-               D
+        throws D,
+               A
     {
         try
         {
             _iceI_throwAorDasAorDAsync(a, context, true).waitForResponseOrUserEx();
         }
-        catch(A ex)
+        catch(D ex)
         {
             throw ex;
         }
-        catch(D ex)
+        catch(A ex)
         {
             throw ex;
         }
@@ -200,8 +200,8 @@ default com.zeroc.Ice.OutgoingAsync<Void> _iceI_throwAorDasAorDAsync(int iceP_a,
     /** @hidden */
     static final Class<?>[] _iceE_throwAorDasAorD =
     {
-        A.class,
-        D.class
+        D.class,
+        A.class
     };
 
     default void throwBasA(int a, int b)
diff --git a/slice2java/php/test/Ice/objects/Test/A.java b/slice2java/php/test/Ice/objects/Test/A.java
index 5deb9056caf1..2aa39219fb8e 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 = 174739833031729662L;
+    private static final long serialVersionUID = -536293083403811177L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/A1.java b/slice2java/php/test/Ice/objects/Test/A1.java
index f47e3fd669f7..341af11b04a0 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 = -5926743813927684692L;
+    private static final long serialVersionUID = -5926752256339481216L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/B.java b/slice2java/php/test/Ice/objects/Test/B.java
index f7c1d5ca9e91..400e87aa2bbe 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 = -8890915187781619960L;
+    private static final long serialVersionUID = -8890917975984078290L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/B1.java b/slice2java/php/test/Ice/objects/Test/B1.java
index 1eb8d0da4b2e..8bd425f6e321 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 = -8662468104112772604L;
+    private static final long serialVersionUID = -3795710900386753148L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/Base.java b/slice2java/php/test/Ice/objects/Test/Base.java
index e03370f29a55..57f7e84e5fea 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 = -3524891043047449068L;
+    private static final long serialVersionUID = -2875395650193458200L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/C.java b/slice2java/php/test/Ice/objects/Test/C.java
index 88bbb89a8943..f6634472de17 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 = -2492773452903885083L;
+    private static final long serialVersionUID = -6158251306590205493L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/COneMember.java b/slice2java/php/test/Ice/objects/Test/COneMember.java
index c4c9a6755b87..c549a83008ce 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 = 3050979328513163355L;
+    private static final long serialVersionUID = 3050969738161946786L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/CTwoMembers.java b/slice2java/php/test/Ice/objects/Test/CTwoMembers.java
index f1b45f0fc9e7..e57c5f92c8c2 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 = -6060532519153690405L;
+    private static final long serialVersionUID = 7395268330913449883L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/D.java b/slice2java/php/test/Ice/objects/Test/D.java
index 96e152a348e2..4cf385de5807 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 = -6348381236531821806L;
+    private static final long serialVersionUID = -6790755237373828195L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/D1.java b/slice2java/php/test/Ice/objects/Test/D1.java
index daea3c509844..d10f8ae3191f 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 = 6932662469312194243L;
+    private static final long serialVersionUID = -6745507718257230141L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/E.java b/slice2java/php/test/Ice/objects/Test/E.java
index 29fe2a713a44..d67c7be4bd20 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 = -5763969576589648124L;
+    private static final long serialVersionUID = 474196403062946178L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/EBase.java b/slice2java/php/test/Ice/objects/Test/EBase.java
index ad65f0669ca5..c8ccd0a28053 100644
--- a/slice2java/php/test/Ice/objects/Test/EBase.java
+++ b/slice2java/php/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -171527183336779058L;
+    private static final long serialVersionUID = 2299265027830990414L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/EDerived.java b/slice2java/php/test/Ice/objects/Test/EDerived.java
index cb0825e3f43f..fbedfffa98eb 100644
--- a/slice2java/php/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/php/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6681031006187618990L;
+    private static final long serialVersionUID = -3816954856164714798L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/EOneMember.java b/slice2java/php/test/Ice/objects/Test/EOneMember.java
index f15585f49438..fb8cbd774826 100644
--- a/slice2java/php/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/php/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225290174031448492L;
+    private static final long serialVersionUID = -6225291493965982611L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java
index ce13c095d7a4..fbbc56e10de1 100644
--- a/slice2java/php/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/php/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2081010363941580844L;
+    private static final long serialVersionUID = 1572035238551908884L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/F.java b/slice2java/php/test/Ice/objects/Test/F.java
index 89f94a3d93fc..72d487463e59 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 = 8190435015035372369L;
+    private static final long serialVersionUID = -7941470110857965231L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/F1.java b/slice2java/php/test/Ice/objects/Test/F1.java
index 5f1cbcc41090..9889322b49c1 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 = 6192365809691647584L;
+    private static final long serialVersionUID = 6192365847072787714L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/F3.java b/slice2java/php/test/Ice/objects/Test/F3.java
index f136a31a977e..4746cf5020a2 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 = -3377691029587209742L;
+    private static final long serialVersionUID = 5042420689111419203L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/K.java b/slice2java/php/test/Ice/objects/Test/K.java
index 8afa62f1b9ea..4f059793ebc0 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 = 4645159604692740068L;
+    private static final long serialVersionUID = 4645161105472389540L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/L.java b/slice2java/php/test/Ice/objects/Test/L.java
index 54a03ff82080..89b69bc4ba0b 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 = 6629735978260830631L;
+    private static final long serialVersionUID = 6629744061473948747L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/Recursive.java b/slice2java/php/test/Ice/objects/Test/Recursive.java
index 1c94f8ab033f..e48907916794 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 = 3617875689765072953L;
+    private static final long serialVersionUID = 3617876870275776188L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/objects/Test/S.java b/slice2java/php/test/Ice/objects/Test/S.java
index 084a2e5c7379..686a195bf175 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 = 481769869098567444L;
+    private static final long serialVersionUID = 481772541212447224L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/SOneMember.java b/slice2java/php/test/Ice/objects/Test/SOneMember.java
index abb6866956e2..de8deea1e84a 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 = 6227751195452495682L;
+    private static final long serialVersionUID = 6227760780632965883L;
 }
diff --git a/slice2java/php/test/Ice/objects/Test/STwoMembers.java b/slice2java/php/test/Ice/objects/Test/STwoMembers.java
index 1d31a38b39ea..784ee2891f39 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 = -2648576784216647358L;
+    private static final long serialVersionUID = -931043922780928894L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/AnotherStruct.java b/slice2java/php/test/Ice/operations/Test/AnotherStruct.java
index dbdf00db1f45..7715dd415332 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 = 2723841554732854219L;
+    private static final long serialVersionUID = 2723846690804835841L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/MyClass1.java b/slice2java/php/test/Ice/operations/Test/MyClass1.java
index fbfcfdec739d..8c92cb9ef75c 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 = -1943129329048861556L;
+    private static final long serialVersionUID = 2211513928634320782L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/operations/Test/MyStruct1.java b/slice2java/php/test/Ice/operations/Test/MyStruct1.java
index f17422db2634..1fc22f3b7da4 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 = 8659106206763650789L;
+    private static final long serialVersionUID = -4421933183712109977L;
 }
diff --git a/slice2java/php/test/Ice/operations/Test/Structure.java b/slice2java/php/test/Ice/operations/Test/Structure.java
index b6dbf598141d..6400677b0d12 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 = -5111928174090664819L;
+    private static final long serialVersionUID = -4456877502679961208L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/A.java b/slice2java/php/test/Ice/optional/Test/A.java
index 9eea2fbaf884..7870af9ecb5f 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 = 507233921721135632L;
+    private static final long serialVersionUID = -3540202200793560048L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/B.java b/slice2java/php/test/Ice/optional/Test/B.java
index 1e45a72e4c09..5aac84ac0a3d 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 = -5744077376906150813L;
+    private static final long serialVersionUID = 6833860342931876579L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/C.java b/slice2java/php/test/Ice/optional/Test/C.java
index 9f3ef3f4600b..45a317088488 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 = -1030650437866535875L;
+    private static final long serialVersionUID = 2744303941254193917L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/DerivedException.java b/slice2java/php/test/Ice/optional/Test/DerivedException.java
index b785bc5c9711..1143d7ae180b 100644
--- a/slice2java/php/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/php/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2438981562741969376L;
+    private static final long serialVersionUID = 6486379193782402752L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/E.java b/slice2java/php/test/Ice/optional/Test/E.java
index c65ddcc84a24..aa50d6161432 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 = -1850734592554154778L;
+    private static final long serialVersionUID = -1850739245844231427L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/F.java b/slice2java/php/test/Ice/optional/Test/F.java
index d957c042eb03..a90aa070267d 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 = -6430497692608788715L;
+    private static final long serialVersionUID = -6430492719020547826L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/FixedStruct.java b/slice2java/php/test/Ice/optional/Test/FixedStruct.java
index f72064a10864..d28d770ed2ae 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 = 1569601893106273962L;
+    private static final long serialVersionUID = 1569601411460398995L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/G.java b/slice2java/php/test/Ice/optional/Test/G.java
index 0de61ee21526..7904fe655315 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 = -2748770893463500333L;
+    private static final long serialVersionUID = -2523968318798704109L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/G1.java b/slice2java/php/test/Ice/optional/Test/G1.java
index 97f3c31adb9b..ee7648b7d92c 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 = 7339783929296588462L;
+    private static final long serialVersionUID = 7339784731174126414L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/G2.java b/slice2java/php/test/Ice/optional/Test/G2.java
index db60c6640cbd..4bcd8fed98bf 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 = 3824556020789125864L;
+    private static final long serialVersionUID = 3824551367489383056L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/MultiOptional.java b/slice2java/php/test/Ice/optional/Test/MultiOptional.java
index 121e4d804615..5104a65b8fe5 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 = -6696332012341401667L;
+    private static final long serialVersionUID = -6939528396144036624L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/OneOptional.java b/slice2java/php/test/Ice/optional/Test/OneOptional.java
index 3f32e0be1c4a..1157e0c3f49c 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 = -7219598368996926652L;
+    private static final long serialVersionUID = -7219599170918208067L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/OptionalException.java b/slice2java/php/test/Ice/optional/Test/OptionalException.java
index 7f704c78d8b7..cae69dfeede8 100644
--- a/slice2java/php/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/php/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8152696378121663980L;
+    private static final long serialVersionUID = -4535062488317583818L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/php/test/Ice/optional/Test/OptionalWithCustom.java
index e6343277c02d..8865c246ba13 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 = 3078834311768589371L;
+    private static final long serialVersionUID = -7348617142427922117L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/optional/Test/RequiredException.java b/slice2java/php/test/Ice/optional/Test/RequiredException.java
index 61e434935fb9..7a186335d0ef 100644
--- a/slice2java/php/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/php/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894237950176103975L;
+    private static final long serialVersionUID = 2894238752053707271L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/SmallStruct.java b/slice2java/php/test/Ice/optional/Test/SmallStruct.java
index e6370af2c264..b5e6a4001c76 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 = 6700988341336020291L;
+    private static final long serialVersionUID = 6700987859710369084L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/VarStruct.java b/slice2java/php/test/Ice/optional/Test/VarStruct.java
index 36269795b7ae..e44aaf72a457 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 = -1912284938287572954L;
+    private static final long serialVersionUID = -1912284136410035002L;
 }
diff --git a/slice2java/php/test/Ice/optional/Test/WD.java b/slice2java/php/test/Ice/optional/Test/WD.java
index 13b1d2f74d3f..f71eb0cc9f7f 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 = -1119400223548751958L;
+    private static final long serialVersionUID = -6602162416990633005L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C.java b/slice2java/php/test/Ice/scope/Test/C.java
index e23ae5a6a90a..10eb0a1b8835 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 = -5190249967841085054L;
+    private static final long serialVersionUID = -5190248392232372328L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C1.java b/slice2java/php/test/Ice/scope/Test/C1.java
index 905a9b65e31a..8c40d9e963d3 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 = 8893230425397112003L;
+    private static final long serialVersionUID = 8893234811227440601L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Ice/scope/Test/C2.java b/slice2java/php/test/Ice/scope/Test/C2.java
index d2c79c94a5b9..eeb0ed69a8ef 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 = 856716416590333890L;
+    private static final long serialVersionUID = -738570842734610662L;
 
     /** @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 11a616ae2cf0..99e523dc7243 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 = 4615625617934072730L;
+    private static final long serialVersionUID = 4615626687203588805L;
 
     /** @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 bc5a3be81531..766f684a54ea 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 = 672580561303035806L;
+    private static final long serialVersionUID = 672593212622243625L;
 
     /** @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 755e02a33cd6..ea1b9bf8bbf0 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 = 8654442209310421414L;
+    private static final long serialVersionUID = 8654437823473647860L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/Inner/S.java b/slice2java/php/test/Ice/scope/Test/Inner/S.java
index 7eafd5354146..75e592b2d50e 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 = 3694613290991489770L;
+    private static final long serialVersionUID = 3694620487057992376L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S.java b/slice2java/php/test/Ice/scope/Test/S.java
index cf6d4558aa7e..b8d87d9c11ec 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 = 2159705513953048148L;
+    private static final long serialVersionUID = 2159700962813085190L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S1.java b/slice2java/php/test/Ice/scope/Test/S1.java
index e57034bc2567..a3df5d65d1e4 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 = 1241672064759389306L;
+    private static final long serialVersionUID = 1241678413624483808L;
 }
diff --git a/slice2java/php/test/Ice/scope/Test/S2.java b/slice2java/php/test/Ice/scope/Test/S2.java
index 239672335c85..f5b4218c7977 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 = 7501862213561875771L;
+    private static final long serialVersionUID = 6468810076106788067L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java
index 2c8701925e7c..93ee39769a4d 100644
--- a/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/php/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477023280358751017L;
+    private static final long serialVersionUID = -477016855227195257L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java
index b06b7fa449eb..b83220b9dfe7 100644
--- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485209815533091057L;
+    private static final long serialVersionUID = 3485210454902084897L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 7ada140aad2f..36417c1cc62b 100644
--- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717377227812552960L;
+    private static final long serialVersionUID = 1717371133467552464L;
 }
diff --git a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 50819f1b5d9d..28a2faa62898 100644
--- a/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/php/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384912424786196903L;
+    private static final long serialVersionUID = -7384916904819933175L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/B.java b/slice2java/php/test/Ice/slicing/objects/Test/B.java
index 600ed613392e..19dedf813cac 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 = -1074636087690341930L;
+    private static final long serialVersionUID = -8482810052294624359L;
 
     /** @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 a45e251ff4db..59656685cac1 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3008763260263742438L;
+    private static final long serialVersionUID = 3216654372580199381L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/php/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 6485507665ce..468c4460add7 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 = -6397005527602696883L;
+    private static final long serialVersionUID = -6397001792786095701L;
 
     /** @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 1a008879c597..c31cd51b03e7 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 = -9066885990440727596L;
+    private static final long serialVersionUID = -9066887981880087153L;
 
     /** @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 491232050e2a..9e9c74b6f813 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 = 9138986364925460853L;
+    private static final long serialVersionUID = 4245901637311943194L;
 
     /** @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 619428aaa53a..04dca76fb29a 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 = -3552262382923453128L;
+    private static final long serialVersionUID = 2491597035050909009L;
 
     /** @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 6aa3945702c3..487a3f81e913 100644
--- a/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/php/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -206855592539505586L;
+    private static final long serialVersionUID = 5430110468380814958L;
 }
diff --git a/slice2java/php/test/Ice/slicing/objects/Test/Forward.java b/slice2java/php/test/Ice/slicing/objects/Test/Forward.java
index a8b6d89f22d2..a59b1c522b68 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 = -7655929154685764092L;
+    private static final long serialVersionUID = -7655927133496240431L;
 
     /** @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 3680390aa437..f4eb34b5c75c 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 = -2271122705162553221L;
+    private static final long serialVersionUID = -2271124846421785320L;
 
     /** @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 a89b400bed5a..f5dc565f9f65 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 = 481719347057888211L;
+    private static final long serialVersionUID = 481712907745612104L;
 
     /** @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 6cde623e08c8..ebcbfeb9f1ef 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 = -4426885099576647155L;
+    private static final long serialVersionUID = -4426886819612551061L;
 
     /** @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 8a87d1e97d96..3da1190becb6 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 = 850536484490953704L;
+    private static final long serialVersionUID = 850538530298630450L;
 
     /** @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 709355d79f3c..a422ebbd485f 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 = -4328901892192150853L;
+    private static final long serialVersionUID = -4328898888514038155L;
 
     /** @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 0f5a65f33deb..7de8230d022d 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 = -5081815389561364309L;
+    private static final long serialVersionUID = -5081818478598560541L;
 
     /** @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 5af5a0f28122..9a57ddeffc08 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 = 643090986326672595L;
+    private static final long serialVersionUID = 643086200138629384L;
 
     /** @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 df377427120b..f1060c6efed5 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 = -2438008381086938903L;
+    private static final long serialVersionUID = -2438000939860216764L;
 
     /** @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 956a90497a5a..0aab6491fe83 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 = 3651534728129905617L;
+    private static final long serialVersionUID = 3651532586875560574L;
 
     /** @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 db7e0191c29b..0488aa952458 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 = 8804376869843410548L;
+    private static final long serialVersionUID = 8804372403947503195L;
 
     /** @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 1204ea2adbae..51eab769765e 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 = -5353756281235142270L;
+    private static final long serialVersionUID = -5353754460265551379L;
 
     /** @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 18d73c660f23..0250151deca2 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 = -6522145368387276194L;
+    private static final long serialVersionUID = -6522141735500923640L;
 
     /** @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 084afaa479db..86a04d79abcb 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 = 7620282556109427677L;
+    private static final long serialVersionUID = 7620283376178689675L;
 
     /** @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 c0cc571f0a66..280db1fcf531 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 = 9187407377385993711L;
+    private static final long serialVersionUID = -3187557772129647334L;
 }
diff --git a/slice2java/php/test/Slice/escape/Clash/Cls.java b/slice2java/php/test/Slice/escape/Clash/Cls.java
index 9c7c71064f2e..3399c006cfbf 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 = 2078197294591298661L;
+    private static final long serialVersionUID = -3583974080559967099L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/escape/Clash/Ex.java b/slice2java/php/test/Slice/escape/Clash/Ex.java
index 7374d8ec1390..165be3566301 100644
--- a/slice2java/php/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/php/test/Slice/escape/Clash/Ex.java
@@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2561258379896677095L;
+    private static final long serialVersionUID = -667711089824830443L;
 }
diff --git a/slice2java/php/test/Slice/escape/Clash/St.java b/slice2java/php/test/Slice/escape/Clash/St.java
index 284489928f16..5fb0d07ee171 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 = 5051819265766993300L;
+    private static final long serialVersionUID = 9088351900318436944L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/echo.java b/slice2java/php/test/Slice/escape/and/echo.java
index 54e40b09749e..8994b33bb5fb 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 = -7559721982508784684L;
+    private static final long serialVersionUID = 3492936984527209623L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/escape/and/endif.java b/slice2java/php/test/Slice/escape/and/endif.java
index 8d9287ed9128..7dd018dfe606 100644
--- a/slice2java/php/test/Slice/escape/and/endif.java
+++ b/slice2java/php/test/Slice/escape/and/endif.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3766565320116529929L;
+    private static final long serialVersionUID = -3766558847428271587L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/endwhile.java b/slice2java/php/test/Slice/escape/and/endwhile.java
index bd2e7dc2aea1..7ac04a8f58d8 100644
--- a/slice2java/php/test/Slice/escape/and/endwhile.java
+++ b/slice2java/php/test/Slice/escape/and/endwhile.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1970733529931264850L;
+    private static final long serialVersionUID = 93145205767773166L;
 }
diff --git a/slice2java/php/test/Slice/escape/and/xor.java b/slice2java/php/test/Slice/escape/and/xor.java
index b5a7eaf4a096..daed195aac89 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 = 8957200232660720116L;
+    private static final long serialVersionUID = 6291529862143775838L;
 }
diff --git a/slice2java/php/test/Slice/macros/Test/Default.java b/slice2java/php/test/Slice/macros/Test/Default.java
index 4331cf7017ee..2cdd19c4e713 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 = -2746800859162794626L;
+    private static final long serialVersionUID = -3960158719184768578L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/macros/Test/NoDefault.java b/slice2java/php/test/Slice/macros/Test/NoDefault.java
index 5172caaecbf6..aa9f1c226410 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 = -5233780012285641057L;
+    private static final long serialVersionUID = -2276408021927435553L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/structure/Test/C.java b/slice2java/php/test/Slice/structure/Test/C.java
index e0942885bcc2..d13b2b2029cf 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 = -3172281711458182936L;
+    private static final long serialVersionUID = -3172282794923736378L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/php/test/Slice/structure/Test/S1.java b/slice2java/php/test/Slice/structure/Test/S1.java
index c7bb548eaa99..6fc27e25307d 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 = -5542857751639758889L;
+    private static final long serialVersionUID = -5542853855361723672L;
 }
diff --git a/slice2java/php/test/Slice/structure/Test/S2.java b/slice2java/php/test/Slice/structure/Test/S2.java
index 736794a3a9bd..7c215150860d 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 = 6051281944970690878L;
+    private static final long serialVersionUID = -2205458933676329726L;
 }
diff --git a/slice2java/python/test/Glacier2/router/Test/CallbackException.java b/slice2java/python/test/Glacier2/router/Test/CallbackException.java
index ef13d380e598..8d65fbaf6a24 100644
--- a/slice2java/python/test/Glacier2/router/Test/CallbackException.java
+++ b/slice2java/python/test/Glacier2/router/Test/CallbackException.java
@@ -58,5 +58,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1865376303071965874L;
+    private static final long serialVersionUID = -6001531100429433486L;
 }
diff --git a/slice2java/python/test/Ice/custom/Test/C.java b/slice2java/python/test/Ice/custom/Test/C.java
index 031f78c015b0..f9230b52ccaf 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 = 5971639668236914455L;
+    private static final long serialVersionUID = 3779773022464171991L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/custom/Test/D.java b/slice2java/python/test/Ice/custom/Test/D.java
index 787a328c7d21..01f1c88ca731 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 = -5526088182258923924L;
+    private static final long serialVersionUID = -3056213832266032803L;
 
     /** @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 1ede0e7a518e..c474d6eacc8b 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 = 3896560859475976944L;
+    private static final long serialVersionUID = -6757657811140719126L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/custom/Test/S.java b/slice2java/python/test/Ice/custom/Test/S.java
index 5195aa929ffc..6b3c6568a994 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 = 6536684467726704814L;
+    private static final long serialVersionUID = 5413059196420549358L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Base.java b/slice2java/python/test/Ice/defaultValue/Test/Base.java
index d166fcb7d272..576105a7851e 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 = -2425272081759491106L;
+    private static final long serialVersionUID = 7692010254932580751L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java
index ce88320cdb8e..bec2f33758b2 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/BaseEx.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8076276095622700694L;
+    private static final long serialVersionUID = 2074233789803343291L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaults.java
index 771a13c218b2..216f0cdcd92b 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 = -852088618564456537L;
+    private static final long serialVersionUID = 4521065139690293760L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 32e30100c506..bc7571a8b9ea 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 = 3424146964274511702L;
+    private static final long serialVersionUID = -8722404216321063333L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Derived.java b/slice2java/python/test/Ice/defaultValue/Test/Derived.java
index 6aa6993da480..94945048904b 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 = -2131192838451451441L;
+    private static final long serialVersionUID = 4620959739255315520L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java
index 4cfa6f55e94d..6365755c02bc 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/DerivedEx.java
@@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7730498346477787784L;
+    private static final long serialVersionUID = -8116097228595264265L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
index 25b3f8f5897f..d0ad5cd10263 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaults.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7882027690811892867L;
+    private static final long serialVersionUID = -3938164270980743196L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
index 0381c1503bfc..da3db7761e6d 100644
--- a/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
+++ b/slice2java/python/test/Ice/defaultValue/Test/ExceptionNoDefaultsBase.java
@@ -64,5 +64,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7297162994834004634L;
+    private static final long serialVersionUID = 6051393808370562411L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/python/test/Ice/defaultValue/Test/InnerStruct.java
index e7c106c746eb..83bd1f91a977 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 = 5127393756844548903L;
+    private static final long serialVersionUID = 5127394733177397394L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct1.java b/slice2java/python/test/Ice/defaultValue/Test/Struct1.java
index 130d5aca2c85..d7ea984dca21 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 = 7693066438749983153L;
+    private static final long serialVersionUID = -4197263636633825745L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/Struct2.java b/slice2java/python/test/Ice/defaultValue/Test/Struct2.java
index 5163f6a7b68b..23506134adfa 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 = 7344094552390218644L;
+    private static final long serialVersionUID = 6583231443420682512L;
 }
diff --git a/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/python/test/Ice/defaultValue/Test/StructNoDefaults.java
index f342f3d8bec6..e1a6b525d48a 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 = 8449660379430169847L;
+    private static final long serialVersionUID = 2898195499188231193L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/A.java b/slice2java/python/test/Ice/exceptions/Test/A.java
index 999d542ae55d..b44ba928b7d7 100644
--- a/slice2java/python/test/Ice/exceptions/Test/A.java
+++ b/slice2java/python/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823741895878804351L;
+    private static final long serialVersionUID = 7823744680191920451L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/B.java b/slice2java/python/test/Ice/exceptions/Test/B.java
index d0a219c779fe..1685aa5b8a52 100644
--- a/slice2java/python/test/Ice/exceptions/Test/B.java
+++ b/slice2java/python/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861419457798512321L;
+    private static final long serialVersionUID = -3861405928315496317L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/C.java b/slice2java/python/test/Ice/exceptions/Test/C.java
index 315ec8973a15..db0caa197aa9 100644
--- a/slice2java/python/test/Ice/exceptions/Test/C.java
+++ b/slice2java/python/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080695587081589631L;
+    private static final long serialVersionUID = 1080698371394705731L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/D.java b/slice2java/python/test/Ice/exceptions/Test/D.java
index 8be785a073b9..e89b5ea0148c 100644
--- a/slice2java/python/test/Ice/exceptions/Test/D.java
+++ b/slice2java/python/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780372810303565887L;
+    private static final long serialVersionUID = 4780386339786581891L;
 }
diff --git a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java
index 375d13731af5..a1113c9aa3e2 100644
--- a/slice2java/python/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/python/test/Ice/exceptions/Test/Mod/A.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641407342721263637L;
+    private static final long serialVersionUID = -4641415827884443689L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/A.java b/slice2java/python/test/Ice/objects/Test/A.java
index ba5487377e02..c4065b2fd062 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 = -1469796031308388141L;
+    private static final long serialVersionUID = 3356545340343519678L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/A1.java b/slice2java/python/test/Ice/objects/Test/A1.java
index 535dfc225234..4158df13d5b8 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 = -5926752058804216500L;
+    private static final long serialVersionUID = -5926741950422549432L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/B.java b/slice2java/python/test/Ice/objects/Test/B.java
index 7ecf2238c86e..d961232da47b 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 = -8890917607930696636L;
+    private static final long serialVersionUID = -8890919936442650450L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/B1.java b/slice2java/python/test/Ice/objects/Test/B1.java
index e586cfe4df09..78ee6ef983b1 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 = -5183470918043428924L;
+    private static final long serialVersionUID = 7689844253013861956L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Base.java b/slice2java/python/test/Ice/objects/Test/Base.java
index e127c1ecc5aa..18aeb5b49ae0 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 = 5057534130814109788L;
+    private static final long serialVersionUID = -2494324888126174954L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/C.java b/slice2java/python/test/Ice/objects/Test/C.java
index 70695acf686b..3558fd4cf175 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 = -8546981068803973892L;
+    private static final long serialVersionUID = 5056039089615275073L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/COneMember.java b/slice2java/python/test/Ice/objects/Test/COneMember.java
index 0126c647fdc1..f6dcfd7cb0ca 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 = 3050971082392634374L;
+    private static final long serialVersionUID = 3050973152681851973L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/CTwoMembers.java b/slice2java/python/test/Ice/objects/Test/CTwoMembers.java
index 42206dafaf74..eaf39271b770 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 = -716298461827676389L;
+    private static final long serialVersionUID = 2944822958266431963L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/D.java b/slice2java/python/test/Ice/objects/Test/D.java
index 66f58b3790b9..2b2a0b1afafe 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 = 8362105023661998643L;
+    private static final long serialVersionUID = 3284667942757685684L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/D1.java b/slice2java/python/test/Ice/objects/Test/D1.java
index 2e248b079544..f5dd4d88f919 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 = 2153880774681709059L;
+    private static final long serialVersionUID = 471358797795003651L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/E.java b/slice2java/python/test/Ice/objects/Test/E.java
index 5e7915a27056..b3c8eace7cf7 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 = -2330384420773370556L;
+    private static final long serialVersionUID = -6356780040405028476L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/EBase.java b/slice2java/python/test/Ice/objects/Test/EBase.java
index 4cda8f08a387..6e461b563460 100644
--- a/slice2java/python/test/Ice/objects/Test/EBase.java
+++ b/slice2java/python/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8463659962569138034L;
+    private static final long serialVersionUID = -3620627218229994994L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/EDerived.java b/slice2java/python/test/Ice/objects/Test/EDerived.java
index d8d12dc97a94..249869cd4819 100644
--- a/slice2java/python/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/python/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7101893099570727790L;
+    private static final long serialVersionUID = 7766458688270828818L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/EOneMember.java b/slice2java/python/test/Ice/objects/Test/EOneMember.java
index e303bd1b5abf..c8bbf95a0fd5 100644
--- a/slice2java/python/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/python/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225293042400374647L;
+    private static final long serialVersionUID = -6225288335071545142L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java
index e0b6f3ecf902..2b7b914b2a2b 100644
--- a/slice2java/python/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/python/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8638200569524310548L;
+    private static final long serialVersionUID = -3501497909444140972L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/F.java b/slice2java/python/test/Ice/objects/Test/F.java
index 7c4689de76eb..89ff5399ba25 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 = -4357496562987417007L;
+    private static final long serialVersionUID = -3880688355870943407L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/F1.java b/slice2java/python/test/Ice/objects/Test/F1.java
index ee04f1f73bc1..b4963e6903e5 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 = 6192369556165855730L;
+    private static final long serialVersionUID = 6192372743672086030L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/F3.java b/slice2java/python/test/Ice/objects/Test/F3.java
index 945ede37ccb3..9e0db0cd2e73 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 = -8575455565717527565L;
+    private static final long serialVersionUID = 489459858099124483L;
 
     /** @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 8bfbcdabea78..6f794caeaa43 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 = -1425265690289137170L;
+    private static final long serialVersionUID = -1425256943158423612L;
 
     /** @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 3270212a9016..7224b9890949 100644
--- a/slice2java/python/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/python/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337233850226248331L;
+    private static final long serialVersionUID = -2337227748111725967L;
 }
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 bc1649a39fbd..869ee62406de 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 = -1298684249564231117L;
+    private static final long serialVersionUID = -1298680637267275048L;
 
     /** @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 599532561c1a..3c9566061bda 100644
--- a/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/python/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842233454069579537L;
+    private static final long serialVersionUID = 1842234421317075221L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/K.java b/slice2java/python/test/Ice/objects/Test/K.java
index 3c98ea698ac5..f70c423384c8 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 = 4645168014647583602L;
+    private static final long serialVersionUID = 4645163361417957733L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/L.java b/slice2java/python/test/Ice/objects/Test/L.java
index 1887b8e55238..010bed2ef31a 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 = 6629744184080142343L;
+    private static final long serialVersionUID = 6629735116764084227L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/M.java b/slice2java/python/test/Ice/objects/Test/M.java
index 877dbeb80fb8..02627cdaf384 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 = -8088098213235058648L;
+    private static final long serialVersionUID = -8088093239712890067L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/Recursive.java b/slice2java/python/test/Ice/objects/Test/Recursive.java
index aa77b8c29202..c4a3a5f714a5 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 = 3617884099750071032L;
+    private static final long serialVersionUID = 3617879126223435261L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/objects/Test/S.java b/slice2java/python/test/Ice/objects/Test/S.java
index 650e19a65a71..98a1c7ed1e7e 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 = 481772738880535860L;
+    private static final long serialVersionUID = 481770575600196016L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/SOneMember.java b/slice2java/python/test/Ice/objects/Test/SOneMember.java
index 257aee1346aa..e1026ae8b075 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 = 6227754141393218975L;
+    private static final long serialVersionUID = 6227757371269854812L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/STwoMembers.java b/slice2java/python/test/Ice/objects/Test/STwoMembers.java
index d732e636a057..5366721e3a58 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 = -1737267846674505598L;
+    private static final long serialVersionUID = 5310521960930153666L;
 }
diff --git a/slice2java/python/test/Ice/objects/Test/StructKey.java b/slice2java/python/test/Ice/objects/Test/StructKey.java
index b16a57f7f705..2c56394e0b95 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 = 7493432126397015944L;
+    private static final long serialVersionUID = 5811076022624581320L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/AnotherStruct.java b/slice2java/python/test/Ice/operations/Test/AnotherStruct.java
index f17baca035b1..f474cea86ae0 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 = 2723849843374713642L;
+    private static final long serialVersionUID = 2723849592830067176L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/MyClass1.java b/slice2java/python/test/Ice/operations/Test/MyClass1.java
index 1ae550ae16ee..0d6b99f8ce6e 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 = 7214798674915963275L;
+    private static final long serialVersionUID = -2235647589888479223L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct.java b/slice2java/python/test/Ice/operations/Test/MyStruct.java
index d3481f222ca0..a5b44c49ec3e 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 = 2951919811881574365L;
+    private static final long serialVersionUID = 2624082347816422813L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/MyStruct1.java b/slice2java/python/test/Ice/operations/Test/MyStruct1.java
index dbe0c8c36968..77ddf0328eea 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 = -135084180056634846L;
+    private static final long serialVersionUID = 7628704812390363168L;
 }
diff --git a/slice2java/python/test/Ice/operations/Test/Structure.java b/slice2java/python/test/Ice/operations/Test/Structure.java
index 5ad68e7c9a99..3f3cd350e7d7 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 = -742511059489015356L;
+    private static final long serialVersionUID = 1314594548283026246L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/A.java b/slice2java/python/test/Ice/optional/Test/A.java
index f7991210ee2c..6135d0f45c96 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 = -6924465205688274800L;
+    private static final long serialVersionUID = 7516484954031453072L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/B.java b/slice2java/python/test/Ice/optional/Test/B.java
index 8fe3528ddec6..097c64217a7a 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 = 6582903043280022627L;
+    private static final long serialVersionUID = 8057866433309608419L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/C.java b/slice2java/python/test/Ice/optional/Test/C.java
index efc8a8e46831..5690ec8762db 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 = 1159580985517156093L;
+    private static final long serialVersionUID = -141179836871120131L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/DerivedException.java b/slice2java/python/test/Ice/optional/Test/DerivedException.java
index 129f2fa28ce3..40295b8bcc21 100644
--- a/slice2java/python/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/python/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8920881150108596965L;
+    private static final long serialVersionUID = 3967245291858119919L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/E.java b/slice2java/python/test/Ice/optional/Test/E.java
index 5b90d54d1a43..64e4bfc03221 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 = -1850732548295766760L;
+    private static final long serialVersionUID = -1850740535892275822L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/F.java b/slice2java/python/test/Ice/optional/Test/F.java
index cbbea51b678f..05fbfb1fe429 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 = -6430494281710767509L;
+    private static final long serialVersionUID = -6430496522540606751L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/FixedStruct.java b/slice2java/python/test/Ice/optional/Test/FixedStruct.java
index 16513e411c32..70705d80686c 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 = 1569613564162470541L;
+    private static final long serialVersionUID = 1569605537609852918L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/G.java b/slice2java/python/test/Ice/optional/Test/G.java
index 1248dec588b9..c8eb5dc5ffd4 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 = 3218868211843161043L;
+    private static final long serialVersionUID = -6098415830463564333L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/G1.java b/slice2java/python/test/Ice/optional/Test/G1.java
index 66efdd70166a..76d803818c76 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 = 7339783168483976299L;
+    private static final long serialVersionUID = 7339780119467823969L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/G2.java b/slice2java/python/test/Ice/optional/Test/G2.java
index 1cdccc076ed6..44ea8e526b20 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 = 3824558065042160311L;
+    private static final long serialVersionUID = 3824549395560483895L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/MultiOptional.java b/slice2java/python/test/Ice/optional/Test/MultiOptional.java
index 98803eb90353..a160770ae0fe 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 = 5414528315169122807L;
+    private static final long serialVersionUID = 2446206067180195309L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/OneOptional.java b/slice2java/python/test/Ice/optional/Test/OneOptional.java
index 9a7fbcf3d0b6..5a88f72642b5 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 = -7219608678697396701L;
+    private static final long serialVersionUID = -7219600691037272552L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/OptionalException.java b/slice2java/python/test/Ice/optional/Test/OptionalException.java
index 8ce287e1cc3a..a35e173b3cbe 100644
--- a/slice2java/python/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/python/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3893524680326388248L;
+    private static final long serialVersionUID = 1056655182010557056L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/python/test/Ice/optional/Test/OptionalWithCustom.java
index 24842f0e4927..9d6e17336ada 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 = 3155957976206041275L;
+    private static final long serialVersionUID = 260389394972503483L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/optional/Test/RequiredException.java b/slice2java/python/test/Ice/optional/Test/RequiredException.java
index dd8d9cb9559a..42509c1875ec 100644
--- a/slice2java/python/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/python/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894245289450591330L;
+    private static final long serialVersionUID = 2894242922327295336L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/SmallStruct.java b/slice2java/python/test/Ice/optional/Test/SmallStruct.java
index 7b56f22c7019..0c1e4dbb5090 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 = 6700991912332363675L;
+    private static final long serialVersionUID = 6700983203982818647L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/VarStruct.java b/slice2java/python/test/Ice/optional/Test/VarStruct.java
index bed93e0e49c5..77099ede5c66 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 = -1912285699100185117L;
+    private static final long serialVersionUID = -1912288066221250839L;
 }
diff --git a/slice2java/python/test/Ice/optional/Test/WD.java b/slice2java/python/test/Ice/optional/Test/WD.java
index 9848e13b785b..d1b55de607e2 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 = 1098497432302861032L;
+    private static final long serialVersionUID = -4317941914082794695L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/C1.java b/slice2java/python/test/Ice/packagemd/Test1/C1.java
index 695bda30d214..3dd45cfe3946 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 = 1894604644276094044L;
+    private static final long serialVersionUID = 1894596121966614716L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/C2.java b/slice2java/python/test/Ice/packagemd/Test1/C2.java
index c06af3807950..7485adabee10 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 = 2892578681045820814L;
+    private static final long serialVersionUID = 2892575621486937198L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test1/E1.java b/slice2java/python/test/Ice/packagemd/Test1/E1.java
index 459c98aeaddd..fb5d2cbf3151 100644
--- a/slice2java/python/test/Ice/packagemd/Test1/E1.java
+++ b/slice2java/python/test/Ice/packagemd/Test1/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5787336629681492691L;
+    private static final long serialVersionUID = 5787345151990971891L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test1/E2.java b/slice2java/python/test/Ice/packagemd/Test1/E2.java
index ed304fc72800..aaf07bce4761 100644
--- a/slice2java/python/test/Ice/packagemd/Test1/E2.java
+++ b/slice2java/python/test/Ice/packagemd/Test1/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4908757075298779220L;
+    private static final long serialVersionUID = 4908749216654126772L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test1/def.java b/slice2java/python/test/Ice/packagemd/Test1/def.java
index 7a18209857e0..e1061a371866 100644
--- a/slice2java/python/test/Ice/packagemd/Test1/def.java
+++ b/slice2java/python/test/Ice/packagemd/Test1/def.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7298386368739174784L;
+    private static final long serialVersionUID = 7298389428295475680L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test2/C1.java b/slice2java/python/test/Ice/packagemd/Test2/C1.java
index 363b9ca43de6..cbcd9ab99666 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 = -860914637247234872L;
+    private static final long serialVersionUID = -860918764773570603L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test2/C2.java b/slice2java/python/test/Ice/packagemd/Test2/C2.java
index 2e0f4dc9abfe..463cc2048541 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 = 954148872152363582L;
+    private static final long serialVersionUID = 954150199872697311L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test2/E1.java b/slice2java/python/test/Ice/packagemd/Test2/E1.java
index d5521ed4b7d4..2ad6fd1aafab 100644
--- a/slice2java/python/test/Ice/packagemd/Test2/E1.java
+++ b/slice2java/python/test/Ice/packagemd/Test2/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6934989954934045927L;
+    private static final long serialVersionUID = 6934988627294969850L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test2/E2.java b/slice2java/python/test/Ice/packagemd/Test2/E2.java
index de2238246708..48c40c55f48a 100644
--- a/slice2java/python/test/Ice/packagemd/Test2/E2.java
+++ b/slice2java/python/test/Ice/packagemd/Test2/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5414537726380924391L;
+    private static final long serialVersionUID = 5414536243831484358L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test3/C1.java b/slice2java/python/test/Ice/packagemd/Test3/C1.java
index c42b35c6bd47..7a063cca76d9 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 = 5832345878628431241L;
+    private static final long serialVersionUID = 5832349851191712532L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test3/C2.java b/slice2java/python/test/Ice/packagemd/Test3/C2.java
index 501cfb178eef..b34091d62bd8 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 = 2769376877161836062L;
+    private static final long serialVersionUID = 2769372749569531327L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/packagemd/Test3/E1.java b/slice2java/python/test/Ice/packagemd/Test3/E1.java
index e60cdbc97d38..c296e2305539 100644
--- a/slice2java/python/test/Ice/packagemd/Test3/E1.java
+++ b/slice2java/python/test/Ice/packagemd/Test3/E1.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5344590233988150470L;
+    private static final long serialVersionUID = 5344586261424901979L;
 }
diff --git a/slice2java/python/test/Ice/packagemd/Test3/E2.java b/slice2java/python/test/Ice/packagemd/Test3/E2.java
index ad1370fc0950..193343f9dc11 100644
--- a/slice2java/python/test/Ice/packagemd/Test3/E2.java
+++ b/slice2java/python/test/Ice/packagemd/Test3/E2.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8399046926927444666L;
+    private static final long serialVersionUID = -8399051054403496473L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/C.java b/slice2java/python/test/Ice/scope/Test/C.java
index 572d0c9e7914..2beaecfac7f9 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 = -5190251977349282061L;
+    private static final long serialVersionUID = -5190249916177945458L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/C1.java b/slice2java/python/test/Ice/scope/Test/C1.java
index 7a5eec3a8104..a788b11c3a88 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 = 8893238050226196466L;
+    private static final long serialVersionUID = 8893230730026762319L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Ice/scope/Test/C2.java b/slice2java/python/test/Ice/scope/Test/C2.java
index cdbf1806665e..4aa527053df0 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 = 1029826831651075649L;
+    private static final long serialVersionUID = -2746715385163419076L;
 
     /** @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 bbf5b11fa723..9f7f40fee394 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 = 4615624814590297168L;
+    private static final long serialVersionUID = 4615625318306100973L;
 
     /** @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 f1a9e4b0695e..cf024b2cbe12 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 = 672596443754598320L;
+    private static final long serialVersionUID = 672580943582228621L;
 
     /** @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 2ce699a1356e..bd3492b238b7 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 = 8654434584481402987L;
+    private static final long serialVersionUID = 8654441904528891030L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/Inner/S.java b/slice2java/python/test/Ice/scope/Test/Inner/S.java
index d94a8301a2f9..1770e57d664f 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 = 3694622351946874535L;
+    private static final long serialVersionUID = 3694613337489090138L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S.java b/slice2java/python/test/Ice/scope/Test/S.java
index b51090890495..cfd105626b47 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 = 2159704550506568089L;
+    private static final long serialVersionUID = 2159705219493736996L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S1.java b/slice2java/python/test/Ice/scope/Test/S1.java
index 5e90a64ca815..ad0f462083df 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 = 1241675515416869579L;
+    private static final long serialVersionUID = 1241671770299770614L;
 }
diff --git a/slice2java/python/test/Ice/scope/Test/S2.java b/slice2java/python/test/Ice/scope/Test/S2.java
index 71405a483b2c..eafcfe06062b 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 = 7586003719277359928L;
+    private static final long serialVersionUID = -5012374237052634427L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java
index 77b3a040f559..a5da700013f7 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477024303042982237L;
+    private static final long serialVersionUID = -477021574249168034L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java
index fd2db9befcad..76d7d015b52a 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485213602114134597L;
+    private static final long serialVersionUID = 3485210855254680824L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 067ae60a580f..3d64ac129056 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717378581264382004L;
+    private static final long serialVersionUID = 1717375831826629129L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index d5cb11073c95..e2ec6905e977 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384919217754353491L;
+    private static final long serialVersionUID = -7384921938965137968L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index 8c253afc07aa..4ef048f74fea 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424382333695916256L;
+    private static final long serialVersionUID = 3424380433868776504L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 94e9577c68ae..1f6f0a21f8f8 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172594420529151247L;
+    private static final long serialVersionUID = -1172597815710488279L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index b9e72213793b..8bf65cfdf219 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126112678841498232L;
+    private static final long serialVersionUID = -1126109128531780144L;
 }
diff --git a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index 118a209527ec..9a50313eca73 100644
--- a/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
+++ b/slice2java/python/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097571403702802712L;
+    private static final long serialVersionUID = -2097573303548916176L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/B.java b/slice2java/python/test/Ice/slicing/objects/Test/B.java
index 918e89f52f35..95eb8af332d2 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 = -2961055740716476360L;
+    private static final long serialVersionUID = 3689878171223309285L;
 
     /** @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 09907b21f0d8..69aa6f2bdb4a 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8012413516332534132L;
+    private static final long serialVersionUID = -9165308329276422743L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/python/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 1c989384f969..690b8d5337a9 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 = -6396997786500578864L;
+    private static final long serialVersionUID = -6397006049310655553L;
 
     /** @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 c9a1838d4670..64106b5e0df4 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 = -9066879696996923529L;
+    private static final long serialVersionUID = -9066879176408535534L;
 
     /** @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 5c45e2116dfa..959bccf59b6d 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 = 1010981612875788763L;
+    private static final long serialVersionUID = -897343916667740346L;
 
     /** @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 ebd76f72533e..35efe589d117 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 = 1930497719153366542L;
+    private static final long serialVersionUID = 6705401547765736546L;
 
     /** @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 6854a84da03f..44d5d6e39cc8 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 = -7741672803385409489L;
+    private static final long serialVersionUID = -8015454660285544639L;
 
     /** @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 19f993ee3202..b895d93f80cf 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 = -4903340317798099597L;
+    private static final long serialVersionUID = 8247725023848138995L;
 
     /** @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 548e9e60497f..39b24a8bf31b 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 351249169005084315L;
+    private static final long serialVersionUID = -6959814788814884875L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/Forward.java b/slice2java/python/test/Ice/slicing/objects/Test/Forward.java
index fc079e96bfa0..39d610ccf83f 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 = -7655918937701260516L;
+    private static final long serialVersionUID = -7655925233817169829L;
 
     /** @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 7b429c2196d4..7120b62d3f02 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 = -2271132922319635560L;
+    private static final long serialVersionUID = -2271126626272274243L;
 
     /** @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 99d9d1bdc01d..b8dea7084b03 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 = 4147520351459972820L;
+    private static final long serialVersionUID = 4147520493464427250L;
 
     /** @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 1d02f620d4ab..3dba07b67f3e 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 = 481704705668171976L;
+    private static final long serialVersionUID = 481704185079431521L;
 
     /** @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 946cf2e0a3da..40d0ba512123 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 = -4426882813630490864L;
+    private static final long serialVersionUID = -4426891076445306625L;
 
     /** @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 30771f434329..0cd3f0b8fffd 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 = 850539813865989462L;
+    private static final long serialVersionUID = 850542461368774480L;
 
     /** @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 47871c20ddae..dcdaa1b92fbc 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 = -4328908354675121777L;
+    private static final long serialVersionUID = -4328900091856594447L;
 
     /** @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 11fde453358c..71d34aaf0315 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 = -5081806284714278607L;
+    private static final long serialVersionUID = -5081814547522514064L;
 
     /** @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 44858c047d68..af836dba6c4f 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 = 643078207046567984L;
+    private static final long serialVersionUID = 643084503093720213L;
 
     /** @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 c64606373fd5..72fb39522b2f 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 = -2438003939712533892L;
+    private static final long serialVersionUID = -2438013797599419374L;
 
     /** @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 16a856b68a16..fbf598adb586 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 = 2511445792403465426L;
+    private static final long serialVersionUID = -1744019299390431757L;
 
     /** @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 58e533466bd6..ab12e90ff4e9 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 = -8813712619160746777L;
+    private static final long serialVersionUID = -8813712267828357911L;
 
     /** @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 1897ea580faa..03f0b18d2ea8 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 = 3651524511094066591L;
+    private static final long serialVersionUID = 3651529234066393589L;
 
     /** @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 010caf332c33..892ea2b7e2e5 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 = 8804375321293022010L;
+    private static final long serialVersionUID = 8804382534206175568L;
 
     /** @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 d9f0154f5205..b595961d6db4 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 = -4989058732932448632L;
+    private static final long serialVersionUID = -4989058880005934975L;
 
     /** @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 3622ca7cc017..a42ee5811189 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 = -5353757294957118132L;
+    private static final long serialVersionUID = -5353762028270953882L;
 
     /** @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 534facfd2238..0b67d183247d 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 = -6522133615930015457L;
+    private static final long serialVersionUID = -6522138550654021672L;
 
     /** @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 7cccca256d8a..d9cb5f448585 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 = 7620286128408507292L;
+    private static final long serialVersionUID = 7620286648849939419L;
 
     /** @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 ff5c57eee53b..edaf716f2fa2 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 = 649122265614879966L;
+    private static final long serialVersionUID = 1164454744704598105L;
 }
diff --git a/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/python/test/Ice/slicing/objects/Test/SUnknown.java
index f4aebb89bf1a..1356c1b101e3 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 = -1337811603117782003L;
+    private static final long serialVersionUID = 7721027263289466761L;
 
     /** @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 b93913c35e14..cf47e59393ba 100644
--- a/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java
+++ b/slice2java/python/test/Ice/slicing/objects/Test/UnknownDerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4542779772411518761L;
+    private static final long serialVersionUID = 7366823400018886331L;
 }
diff --git a/slice2java/python/test/Slice/escape/Clash/Cls.java b/slice2java/python/test/Slice/escape/Clash/Cls.java
index 37b9c75aa1d0..72e8cbe8cfe5 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 = 2857097094426291550L;
+    private static final long serialVersionUID = 4771375535073704545L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/escape/Clash/Ex.java b/slice2java/python/test/Slice/escape/Clash/Ex.java
index 1a8b21a9380a..f04ff94e6f5a 100644
--- a/slice2java/python/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/python/test/Slice/escape/Clash/Ex.java
@@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8217686188229562357L;
+    private static final long serialVersionUID = -7814459407898660437L;
 }
diff --git a/slice2java/python/test/Slice/escape/Clash/St.java b/slice2java/python/test/Slice/escape/Clash/St.java
index 73a486c83a37..3b73b24fb918 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 = -2231038127539867400L;
+    private static final long serialVersionUID = -6069581671187909448L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/_continue.java b/slice2java/python/test/Slice/escape/and/_continue.java
index c90a924bfa8c..b9b624f3944f 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 = 1201383732041178585L;
+    private static final long serialVersionUID = 1201377839141046007L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/_for.java b/slice2java/python/test/Slice/escape/and/_for.java
index 498f1a2a092b..8e395a9a802c 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 = 3734222103107743128L;
+    private static final long serialVersionUID = 2197932340371940378L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/escape/and/is.java b/slice2java/python/test/Slice/escape/and/is.java
index 24ca7db99fc3..6819a8366711 100644
--- a/slice2java/python/test/Slice/escape/and/is.java
+++ b/slice2java/python/test/Slice/escape/and/is.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4585937569135962078L;
+    private static final long serialVersionUID = -4585936806093661044L;
 }
diff --git a/slice2java/python/test/Slice/escape/and/not.java b/slice2java/python/test/Slice/escape/and/not.java
index e674337e6b60..ccaf41d09bbb 100644
--- a/slice2java/python/test/Slice/escape/and/not.java
+++ b/slice2java/python/test/Slice/escape/and/not.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3496592908246036487L;
+    private static final long serialVersionUID = -5942194233858856391L;
 }
diff --git a/slice2java/python/test/Slice/macros/Test/Default.java b/slice2java/python/test/Slice/macros/Test/Default.java
index d1023fc80d4e..2982e168c330 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 = 7721303563638873694L;
+    private static final long serialVersionUID = -7003431207325475490L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/macros/Test/NoDefault.java b/slice2java/python/test/Slice/macros/Test/NoDefault.java
index 0d3e4a6f45c3..7b2a8fb424db 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 = 3799850592449250879L;
+    private static final long serialVersionUID = 3667485310828164927L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/structure/Test/C.java b/slice2java/python/test/Slice/structure/Test/C.java
index f2340d82bcc4..4290c708eda0 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 = 1667155548835284428L;
+    private static final long serialVersionUID = 1667151498789365001L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/python/test/Slice/structure/Test/S1.java b/slice2java/python/test/Slice/structure/Test/S1.java
index 60a330df2ae8..f1b5221a5260 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 = -5542862641281941212L;
+    private static final long serialVersionUID = -5542855781006454047L;
 }
diff --git a/slice2java/python/test/Slice/structure/Test/S2.java b/slice2java/python/test/Slice/structure/Test/S2.java
index b389cc5d72e5..6fc47534e60b 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 = -7682611824894904428L;
+    private static final long serialVersionUID = -7695999908083192150L;
 }
diff --git a/slice2java/python/test/Slice/structure/Test/S3.java b/slice2java/python/test/Slice/structure/Test/S3.java
index 52c1c2b45100..b7e3b19b4711 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 = -5743992755682580082L;
+    private static final long serialVersionUID = -5242955397342803762L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Base.java b/slice2java/ruby/test/Ice/defaultValue/Test/Base.java
index 181b31d61fa8..4bac6c00ad83 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 = -6685891445050366114L;
+    private static final long serialVersionUID = 1552451135328443L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaults.java
index f5cde72b8c07..ef5d4f784d09 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 = 6527454785250033596L;
+    private static final long serialVersionUID = 6302543990090939192L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java b/slice2java/ruby/test/Ice/defaultValue/Test/ClassNoDefaultsBase.java
index 17e10ef2b16e..890d6ee794f9 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 = -6388697514496735781L;
+    private static final long serialVersionUID = 2669967957988509256L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java b/slice2java/ruby/test/Ice/defaultValue/Test/Derived.java
index 7dddc3a2c0dd..f3b66c610f12 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 = -4601069890162078001L;
+    private static final long serialVersionUID = 382347884716829312L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java b/slice2java/ruby/test/Ice/defaultValue/Test/InnerStruct.java
index a3e890a4607e..2d18da261e2b 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 = 5127387623726025809L;
+    private static final long serialVersionUID = 5127392167022245908L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct1.java
index 1f3487af8215..1c360d3fb5aa 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 = -7306133540728201615L;
+    private static final long serialVersionUID = -4140970885688187141L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java b/slice2java/ruby/test/Ice/defaultValue/Test/Struct2.java
index a4d96be059a2..a2898c371fee 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 = 3906942443273757652L;
+    private static final long serialVersionUID = -3876273692469616162L;
 }
diff --git a/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java b/slice2java/ruby/test/Ice/defaultValue/Test/StructNoDefaults.java
index f47424862ff1..d60657b32dea 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 = 1273606160551332514L;
+    private static final long serialVersionUID = -8334693190710996933L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/A.java b/slice2java/ruby/test/Ice/exceptions/Test/A.java
index 889efdbf4845..51e19303b815 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/A.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823745384120008412L;
+    private static final long serialVersionUID = 7823737105686792565L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/B.java b/slice2java/ruby/test/Ice/exceptions/Test/B.java
index d168bd10a15d..6bdab63ff91b 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/B.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861410514240069988L;
+    private static final long serialVersionUID = -3861418957981325259L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/C.java b/slice2java/ruby/test/Ice/exceptions/Test/C.java
index 4ebeb8e5a8c4..30d25a9ea9d1 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/C.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080699075322793692L;
+    private static final long serialVersionUID = 1080690796889577845L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/D.java b/slice2java/ruby/test/Ice/exceptions/Test/D.java
index 926bc8f20449..40d4594f5825 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/D.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780381753862008220L;
+    private static final long serialVersionUID = 4780373310120752949L;
 }
diff --git a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java
index 947f5f5000a2..30c44a2ceae5 100644
--- a/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/ruby/test/Ice/exceptions/Test/Mod/A.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641413801493179576L;
+    private static final long serialVersionUID = -4641410810496074527L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/A.java b/slice2java/ruby/test/Ice/objects/Test/A.java
index 3dd6645ec36d..52303ede85ff 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 = 263948837766927230L;
+    private static final long serialVersionUID = -5195409359412846446L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/A1.java b/slice2java/ruby/test/Ice/objects/Test/A1.java
index 680ba401f5a2..40afe304f20c 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 = -5926739287408528516L;
+    private static final long serialVersionUID = -5926743175932610979L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/B.java b/slice2java/ruby/test/Ice/objects/Test/B.java
index 38788f6e8862..45dae3dc4cc2 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 = -8890911779516105256L;
+    private static final long serialVersionUID = -8890910373283248403L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/B1.java b/slice2java/ruby/test/Ice/objects/Test/B1.java
index 8527f1cb8146..08ed41a44301 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 = 723662445677533316L;
+    private static final long serialVersionUID = 4543825786080176516L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/Base.java b/slice2java/ruby/test/Ice/objects/Test/Base.java
index 102270e4bc50..054991dc4f85 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 = -4284333865782928364L;
+    private static final long serialVersionUID = 2369887464258471036L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/C.java b/slice2java/ruby/test/Ice/objects/Test/C.java
index ae7a3b375a15..bfebfc1014a4 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 = -7343222410417113803L;
+    private static final long serialVersionUID = -9171155855818793100L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/COneMember.java b/slice2java/ruby/test/Ice/objects/Test/COneMember.java
index d581d12c9835..ba7d7bec1451 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 = 3050965149379172242L;
+    private static final long serialVersionUID = 3050971212895252805L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/CTwoMembers.java
index 56804f6f37c6..9ec44260b2f6 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 = 5815593682091564315L;
+    private static final long serialVersionUID = -3139768939095453349L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/D.java b/slice2java/ruby/test/Ice/objects/Test/D.java
index af31da2f8a24..27f62aa3ea6c 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 = -7416914491354076606L;
+    private static final long serialVersionUID = -5111365173047638661L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/D1.java b/slice2java/ruby/test/Ice/objects/Test/D1.java
index 3a2fe95ff4ea..ef11b69e8fc8 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 = -8143464909725051581L;
+    private static final long serialVersionUID = 2837277349292377667L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/E.java b/slice2java/ruby/test/Ice/objects/Test/E.java
index 6529abd10499..b54de29d1b17 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 = -1559864410775790972L;
+    private static final long serialVersionUID = 8069871797516948572L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/EBase.java b/slice2java/ruby/test/Ice/objects/Test/EBase.java
index c3a12f658c74..f6a88f071bf9 100644
--- a/slice2java/ruby/test/Ice/objects/Test/EBase.java
+++ b/slice2java/ruby/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8605715613599149390L;
+    private static final long serialVersionUID = -4960215598235020466L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/EDerived.java b/slice2java/ruby/test/Ice/objects/Test/EDerived.java
index 266048b4bfd6..4ccec7b44243 100644
--- a/slice2java/ruby/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/ruby/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7871581199634012462L;
+    private static final long serialVersionUID = 6828303390314651090L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java
index 03ea319ff38e..9127360b7567 100644
--- a/slice2java/ruby/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/ruby/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225280331762839011L;
+    private static final long serialVersionUID = -6225292842135394870L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java
index 96d28228b259..1c289180a3fb 100644
--- a/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/ruby/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5397506589494291436L;
+    private static final long serialVersionUID = 3831306928505473492L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/F.java b/slice2java/ruby/test/Ice/objects/Test/F.java
index fa47d61dc7d3..e8c3221b286c 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 = 5340004240207289297L;
+    private static final long serialVersionUID = -6029294838229056431L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/F1.java b/slice2java/ruby/test/Ice/objects/Test/F1.java
index d23f1a99949c..1c7c45c7792a 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 = 6192369556172661274L;
+    private static final long serialVersionUID = 6192376636147772894L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/F3.java b/slice2java/ruby/test/Ice/objects/Test/F3.java
index 1753604ff258..69164c37855f 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 = 8495741341395469773L;
+    private static final long serialVersionUID = 2012136225574101957L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/K.java b/slice2java/ruby/test/Ice/objects/Test/K.java
index 1e43a928932f..64816ea47e08 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 = 4645160533118709262L;
+    private static final long serialVersionUID = 4645158961615711990L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/L.java b/slice2java/ruby/test/Ice/objects/Test/L.java
index 68518b09080e..8e9d96b12143 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 = 6629743315014287351L;
+    private static final long serialVersionUID = 6629747534144133526L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/M.java b/slice2java/ruby/test/Ice/objects/Test/M.java
index 26c731286e18..efca22f8fd99 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 = -8088101311621297132L;
+    private static final long serialVersionUID = -8088105530694623831L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/Recursive.java b/slice2java/ruby/test/Ice/objects/Test/Recursive.java
index fec1e3c0e98b..530539c2e056 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 = 3617887197924878442L;
+    private static final long serialVersionUID = 3617885957026141227L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/objects/Test/S.java b/slice2java/ruby/test/Ice/objects/Test/S.java
index c3d32557c3c0..4a794d553dd0 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 = 481773112050434244L;
+    private static final long serialVersionUID = 481774683674359077L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/SOneMember.java b/slice2java/ruby/test/Ice/objects/Test/SOneMember.java
index 66200ba3b465..d51fb672a9db 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 = 6227748683640511627L;
+    private static final long serialVersionUID = 6227754021355729628L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java b/slice2java/ruby/test/Ice/objects/Test/STwoMembers.java
index 05ea42c54bdf..0a6a4d8d2594 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 = 5660619644294025090L;
+    private static final long serialVersionUID = -7251422199645463230L;
 }
diff --git a/slice2java/ruby/test/Ice/objects/Test/StructKey.java b/slice2java/ruby/test/Ice/objects/Test/StructKey.java
index 2098c3deea20..0f3cba21bc01 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 = -1124650900868368952L;
+    private static final long serialVersionUID = -736434062015935728L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java b/slice2java/ruby/test/Ice/operations/Test/AnotherStruct.java
index 5e4943443803..b70bc4c9c5eb 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 = 2723846207966080201L;
+    private static final long serialVersionUID = 2723843338308197251L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyClass1.java b/slice2java/ruby/test/Ice/operations/Test/MyClass1.java
index 74a592f7e0fc..fa09c39af474 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 = 1886182703394971212L;
+    private static final long serialVersionUID = -8024181688661124499L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct.java
index 786268cca720..2f75579fcb1d 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 = -216690751673000259L;
+    private static final long serialVersionUID = -242930717956347395L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java b/slice2java/ruby/test/Ice/operations/Test/MyStruct1.java
index 6b06bfe3f59a..f3773eb949fe 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 = -3815475370046695579L;
+    private static final long serialVersionUID = -4520085069971981916L;
 }
diff --git a/slice2java/ruby/test/Ice/operations/Test/Structure.java b/slice2java/ruby/test/Ice/operations/Test/Structure.java
index 0ba11824bccc..a881dffdf4db 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 = 880334349318872009L;
+    private static final long serialVersionUID = 5398575187178765081L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/A.java b/slice2java/ruby/test/Ice/optional/Test/A.java
index d80748ecb734..b94a7d7d3e3b 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 = -1088194542710105840L;
+    private static final long serialVersionUID = 1916261146821944720L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/B.java b/slice2java/ruby/test/Ice/optional/Test/B.java
index 105093900421..08930afa50da 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 = 2282477826384075107L;
+    private static final long serialVersionUID = 504165428422984803L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/C.java b/slice2java/ruby/test/Ice/optional/Test/C.java
index 798cae22d6f4..f36211515212 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 = -2682818085863427L;
+    private static final long serialVersionUID = -7842846834679647107L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java
index 11d14bf87dab..2939730d2c02 100644
--- a/slice2java/ruby/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/ruby/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5581856600798018931L;
+    private static final long serialVersionUID = 4968629899348614561L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/E.java b/slice2java/ruby/test/Ice/optional/Test/E.java
index f9dea5f8ef6c..13671768760d 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 = -1850729208459298757L;
+    private static final long serialVersionUID = -1850739068842702254L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/F.java b/slice2java/ruby/test/Ice/optional/Test/F.java
index 4d250c48a2a0..a5e215b1b4e0 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 = -6430491851102042296L;
+    private static final long serialVersionUID = -6430492539438809567L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java b/slice2java/ruby/test/Ice/optional/Test/FixedStruct.java
index e568b4b129e4..746a2fe3750f 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 = 1569607651833424377L;
+    private static final long serialVersionUID = 1569601593470992325L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/G.java b/slice2java/ruby/test/Ice/optional/Test/G.java
index 437be4251f79..d34dc61e8e0f 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 = 1334269402093359699L;
+    private static final long serialVersionUID = 7207155146153998483L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/G1.java b/slice2java/ruby/test/Ice/optional/Test/G1.java
index c9666e799e3d..a2c46db83887 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 = 7339789566671712125L;
+    private static final long serialVersionUID = 7339784228872578991L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/G2.java b/slice2java/ruby/test/Ice/optional/Test/G2.java
index e1fee6ea4831..bd2b6d0672f9 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 = 3824561404886931483L;
+    private static final long serialVersionUID = 3824550862623584509L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java b/slice2java/ruby/test/Ice/optional/Test/MultiOptional.java
index 23fd5058f1af..e05fd544bbab 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 = -7817759086995823681L;
+    private static final long serialVersionUID = 5404868145136493783L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/OneOptional.java b/slice2java/ruby/test/Ice/optional/Test/OneOptional.java
index be855f1962cd..4dd17cd0f0c3 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 = -7219604006174083049L;
+    private static final long serialVersionUID = -7219599355503682965L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java
index beda06f4f3c2..5f082c062cad 100644
--- a/slice2java/ruby/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/ruby/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2469815997689776353L;
+    private static final long serialVersionUID = 3616233305051665952L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/ruby/test/Ice/optional/Test/OptionalWithCustom.java
index e8429f29e383..8982c55b7dfe 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 = 7950718383859099003L;
+    private static final long serialVersionUID = 5439119690846047675L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java
index 1a4b682e66b1..81b55e9efcf7 100644
--- a/slice2java/ruby/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/ruby/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894243675058177780L;
+    private static final long serialVersionUID = 2894238934056971558L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java b/slice2java/ruby/test/Ice/optional/Test/SmallStruct.java
index 766067ff5fd8..de7e18482462 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 = 6700994012474939149L;
+    private static final long serialVersionUID = 6700987357397318225L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/VarStruct.java b/slice2java/ruby/test/Ice/optional/Test/VarStruct.java
index 66134a2f90ad..d88f33ad357a 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 = -1912279300912449291L;
+    private static final long serialVersionUID = -1912283956835469529L;
 }
diff --git a/slice2java/ruby/test/Ice/optional/Test/WD.java b/slice2java/ruby/test/Ice/optional/Test/WD.java
index c39a71677b2d..7c9a23805764 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 = -5680508344009269942L;
+    private static final long serialVersionUID = 5100721425136595300L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C.java b/slice2java/ruby/test/Ice/scope/Test/C.java
index 8953d4832056..b5feba2961be 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 = -5190248434943089019L;
+    private static final long serialVersionUID = -5190250550210341178L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C1.java b/slice2java/ruby/test/Ice/scope/Test/C1.java
index 39b8532f4e4e..b7963c9251cc 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 = 8893234853753510631L;
+    private static final long serialVersionUID = 8893236579172087406L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Ice/scope/Test/C2.java b/slice2java/ruby/test/Ice/scope/Test/C2.java
index 60be13d5b688..f63d812cde1b 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 = -6963210796278548962L;
+    private static final long serialVersionUID = 6166941461857928228L;
 
     /** @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 0e67432d52e3..f61fa4be46d9 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 = 4615626644585361312L;
+    private static final long serialVersionUID = 4615626193833245804L;
 
     /** @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 ed5da677042f..6803a338a648 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 = 672593500622165893L;
+    private static final long serialVersionUID = 672586757826216080L;
 
     /** @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 02755e33ecb2..94bed4949ea2 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 = 8654437780801920425L;
+    private static final long serialVersionUID = 8654436006471116201L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/Inner/S.java b/slice2java/ruby/test/Ice/scope/Test/Inner/S.java
index 2276a35f1c52..9fdd7c95c363 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 = 3694620444353482981L;
+    private static final long serialVersionUID = 3694623618946344421L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S.java b/slice2java/ruby/test/Ice/scope/Test/S.java
index e69e84157891..e0ef6450dd91 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 = 2159700920283008859L;
+    private static final long serialVersionUID = 2159695183419996891L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S1.java b/slice2java/ruby/test/Ice/scope/Test/S1.java
index b13f04d66da0..509a270f0f12 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 = 1241678701700413918L;
+    private static final long serialVersionUID = 1241676976295911511L;
 }
diff --git a/slice2java/ruby/test/Ice/scope/Test/S2.java b/slice2java/ruby/test/Ice/scope/Test/S2.java
index 470d4a2443da..01de98056d00 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 = -97174912167546521L;
+    private static final long serialVersionUID = -105270559215815075L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java
index dba823ce9b99..7f0fd592b833 100644
--- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477029853920007344L;
+    private static final long serialVersionUID = -477017205289572220L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java
index d72d3169c97b..7a1dd8ab8515 100644
--- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485218951383457398L;
+    private static final long serialVersionUID = 3485209939527347490L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index d53efd009a17..bbff51e6dce3 100644
--- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717384132160364551L;
+    private static final long serialVersionUID = 1717370822297771731L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 4eb91f52d791..1d08f2d8d41f 100644
--- a/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/ruby/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384913863499257506L;
+    private static final long serialVersionUID = -7384916758962508662L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/B.java b/slice2java/ruby/test/Ice/slicing/objects/Test/B.java
index 63dcfb4d56f4..13a1a61f7a73 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 = -4471997091453174310L;
+    private static final long serialVersionUID = 3204400047143026842L;
 
     /** @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 e8f8984f4510..14838a51f62d 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 137178353869388566L;
+    private static final long serialVersionUID = -3547944444507826218L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/ruby/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 02c436639d77..51699a3625e9 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 = -6397004042411224730L;
+    private static final long serialVersionUID = -6397003939147884510L;
 
     /** @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 a9b492840146..4e43de55d0b1 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 = -9066889842663006469L;
+    private static final long serialVersionUID = -9066879925397618764L;
 
     /** @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 fa0da85cb26e..200e28306fde 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 = -5412284791975335879L;
+    private static final long serialVersionUID = -7864702568108076199L;
 
     /** @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 3b3b16fc1ef7..0949d0869d55 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 = 324623938558853426L;
+    private static final long serialVersionUID = -6885383117023254588L;
 
     /** @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 d3e03ebba331..77b11370e97b 100644
--- a/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/ruby/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3045587805483723083L;
+    private static final long serialVersionUID = 516926203322119765L;
 }
diff --git a/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java b/slice2java/ruby/test/Ice/slicing/objects/Test/Forward.java
index 7ba7554150b5..95d49e177d5a 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 = -7655931088008037859L;
+    private static final long serialVersionUID = -7655919205054630190L;
 
     /** @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 f7bc83bbc6e7..89f629b48867 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 = -2271120937221648795L;
+    private static final long serialVersionUID = -2271132820097051286L;
 
     /** @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 4e43fefc9071..ee5c2dafe588 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 = 481716817006937429L;
+    private static final long serialVersionUID = 481704934119899802L;
 
     /** @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 b79b5231c8fd..432ab51b1acb 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 = -4426894524706577114L;
+    private static final long serialVersionUID = -4426894586604078110L;
 
     /** @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 00ac30b2825b..7e9cb6eb0ee2 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 = 850546069684242840L;
+    private static final long serialVersionUID = 850546136978311898L;
 
     /** @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 61a21fa3c01c..bc85fee0d4e5 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 = -4328903377390304529L;
+    private static final long serialVersionUID = -4328903354338557397L;
 
     /** @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 fc9bb132091d..b7ebf50c3415 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 = -5081816714602941747L;
+    private static final long serialVersionUID = -5081816604740476575L;
 
     /** @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 42d440a5845e..057c23cdb367 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 = 643087544641352636L;
+    private static final long serialVersionUID = 643078309271018739L;
 
     /** @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 edd0f514e0d4..b74fae442738 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 = -2438004694180235779L;
+    private static final long serialVersionUID = -2438003711289610638L;
 
     /** @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 1241bc2fdce8..962ecc86e1df 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 = 3651537177964458011L;
+    private static final long serialVersionUID = 3651524613180090708L;
 
     /** @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 f0296e14d134..548a14e4ec61 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 = 8804374110038845886L;
+    private static final long serialVersionUID = 8804375092772443761L;
 
     /** @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 ea3c94aae03d..99bbdf0a129c 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 = -5353758214644063416L;
+    private static final long serialVersionUID = -5353757231763415801L;
 
     /** @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 700615267cd5..7f9a8f68a45c 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 = -6522142914608096370L;
+    private static final long serialVersionUID = -6522133679223623935L;
 
     /** @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 1b9032a41fa6..7850dfca1f64 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 = 7620285082378998925L;
+    private static final long serialVersionUID = 7620286065108072962L;
 
     /** @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 67438bee7728..06422dcbdec2 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 = 8832414983002587284L;
+    private static final long serialVersionUID = 7071450787347777492L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/and.java b/slice2java/ruby/test/Slice/escape/BEGIN/and.java
index e8cc7f69bd37..0bf6577b442c 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 = 1440101224848534624L;
+    private static final long serialVersionUID = 1440097932982133360L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/display.java b/slice2java/ruby/test/Slice/escape/BEGIN/display.java
index b6b73e1bbc13..1a30481f25ef 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 = 2884549359134827322L;
+    private static final long serialVersionUID = -1800782211022462732L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/next.java b/slice2java/ruby/test/Slice/escape/BEGIN/next.java
index 3d8dbae1f6ac..881fe462aa0e 100644
--- a/slice2java/ruby/test/Slice/escape/BEGIN/next.java
+++ b/slice2java/ruby/test/Slice/escape/BEGIN/next.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3375559013626559287L;
+    private static final long serialVersionUID = 3375556850323059623L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java
index eb9b1c3484f3..6d5fd76ab344 100644
--- a/slice2java/ruby/test/Slice/escape/BEGIN/nil.java
+++ b/slice2java/ruby/test/Slice/escape/BEGIN/nil.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6218744890100976017L;
+    private static final long serialVersionUID = 7680454111762205423L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/Clash/Cls.java b/slice2java/ruby/test/Slice/escape/Clash/Cls.java
index 18d308cc6249..cb3193d51061 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 = -3083028775039054304L;
+    private static final long serialVersionUID = 1863837934677688675L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/escape/Clash/Ex.java b/slice2java/ruby/test/Slice/escape/Clash/Ex.java
index 2582cb9e05ba..3c9e2ea4cdf7 100644
--- a/slice2java/ruby/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/ruby/test/Slice/escape/Clash/Ex.java
@@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6205084334963010711L;
+    private static final long serialVersionUID = -3231637901408108761L;
 }
diff --git a/slice2java/ruby/test/Slice/escape/Clash/St.java b/slice2java/ruby/test/Slice/escape/Clash/St.java
index 35ba11c5247b..d817f1f7b0d5 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 = 7255945268002628405L;
+    private static final long serialVersionUID = -3322296519965122904L;
 }
diff --git a/slice2java/ruby/test/Slice/macros/Test/Default.java b/slice2java/ruby/test/Slice/macros/Test/Default.java
index 2bb5ca2a2e19..de0fe8fdcb05 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 = -8269420486048062594L;
+    private static final long serialVersionUID = -7754716099874034210L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/macros/Test/NoDefault.java b/slice2java/ruby/test/Slice/macros/Test/NoDefault.java
index 31f24dc25d06..1199cef8c738 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 = -2384122152884826977L;
+    private static final long serialVersionUID = 6801744472713420479L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/structure/Test/C.java b/slice2java/ruby/test/Slice/structure/Test/C.java
index 9cda64b49b95..f805473f5f96 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 = -3172275516210320874L;
+    private static final long serialVersionUID = -3172282991223254298L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/ruby/test/Slice/structure/Test/S1.java b/slice2java/ruby/test/Slice/structure/Test/S1.java
index 4ac8e5227661..1c873ff74d33 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 = -5542862456539992140L;
+    private static final long serialVersionUID = -5542853741691205749L;
 }
diff --git a/slice2java/ruby/test/Slice/structure/Test/S2.java b/slice2java/ruby/test/Slice/structure/Test/S2.java
index b70595d789c5..d56c16f384c5 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 = 7540852646897561300L;
+    private static final long serialVersionUID = -4716539014888005299L;
 }
diff --git a/slice2java/scripts/Test/Common/Config.java b/slice2java/scripts/Test/Common/Config.java
index 8bf50deff1ff..da3548478815 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 = -6394247531018123192L;
+    private static final long serialVersionUID = 8403508419634215027L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/scripts/Test/Common/OptionOverrides.java b/slice2java/scripts/Test/Common/OptionOverrides.java
index 2f5b0584d9c2..2e5c409b07a1 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 = 6855864909360213909L;
+    private static final long serialVersionUID = -7725712772145602550L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/scripts/Test/Common/ProcessFailedException.java b/slice2java/scripts/Test/Common/ProcessFailedException.java
index 2cdf9786bf25..246e627689ae 100644
--- a/slice2java/scripts/Test/Common/ProcessFailedException.java
+++ b/slice2java/scripts/Test/Common/ProcessFailedException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5103746290640109354L;
+    private static final long serialVersionUID = 5103744171243612561L;
 }
diff --git a/slice2java/scripts/Test/Common/TestCaseFailedException.java b/slice2java/scripts/Test/Common/TestCaseFailedException.java
index b7377be04460..ef534e387195 100644
--- a/slice2java/scripts/Test/Common/TestCaseFailedException.java
+++ b/slice2java/scripts/Test/Common/TestCaseFailedException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7577591782528229048L;
+    private static final long serialVersionUID = 7577593834730863363L;
 }
diff --git a/slice2java/scripts/Test/Common/TestCaseNotExistException.java b/slice2java/scripts/Test/Common/TestCaseNotExistException.java
index 4e3405db70ed..3b1c8e090bf2 100644
--- a/slice2java/scripts/Test/Common/TestCaseNotExistException.java
+++ b/slice2java/scripts/Test/Common/TestCaseNotExistException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8656772277401250138L;
+    private static final long serialVersionUID = -8656774076485229539L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java
index 86b50ecee76c..5c977c744c19 100644
--- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java
+++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/CannotCreateSessionException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8990430386548820617L;
+    private static final long serialVersionUID = 8990436602368252875L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/IceMX/SessionMetrics.java
index dda5a1927231..fef6c1217a24 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 = 1501503077635051053L;
+    private static final long serialVersionUID = -755210119929947279L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java
index 42d190da2c06..28eeb2bac9f0 100644
--- a/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java
+++ b/slice2java/slice/Glacier2/com/zeroc/Glacier2/PermissionDeniedException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5089370220171519300L;
+    private static final long serialVersionUID = -5089367034196215205L;
 }
diff --git a/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java b/slice2java/slice/Glacier2/com/zeroc/Glacier2/SSLInfo.java
index 9b5a5afc2964..110dfbc19c41 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 = 8208132292856490641L;
+    private static final long serialVersionUID = 7877667976777852969L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/EncodingVersion.java
index a230090eed83..1142ecfa8ec0 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 = -7469935708312206799L;
+    private static final long serialVersionUID = -4540744439270173999L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ChildInvocationMetrics.java
index 6d45be6bfcef..7a999c8932be 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 = 9118789875128672154L;
+    private static final long serialVersionUID = -4022845363665420902L;
 
     /** @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 16124dec5db8..0bcf08261d14 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 = 5170984677256421047L;
+    private static final long serialVersionUID = -7326565434136239433L;
 
     /** @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 ced6371d712c..1a4a64b7e37f 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 = 278575394515962898L;
+    private static final long serialVersionUID = 478893709686294457L;
 
     /** @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 ff19e336a7b8..a35b5d3fd78f 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 = 8286940305185427151L;
+    private static final long serialVersionUID = -1226597310515234449L;
 
     /** @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 ed288d4ed4d6..9e6b387440a5 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 = 400981410069425050L;
+    private static final long serialVersionUID = 7133587011133986232L;
 
     /** @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 b97eda90d268..b30cb185ccd0 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 = 1340825025029416816L;
+    private static final long serialVersionUID = -5546688766715421753L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java b/slice2java/slice/Ice/com/zeroc/Ice/IceMX/ThreadMetrics.java
index 35d6a74544ce..3ccc8cbac327 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 = 7466184772903372020L;
+    private static final long serialVersionUID = -3561826394358432257L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/Identity.java b/slice2java/slice/Ice/com/zeroc/Ice/Identity.java
index 4a7da98a1444..ec8745a9f5de 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 = 1838602769858569701L;
+    private static final long serialVersionUID = -7960589197502407067L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java b/slice2java/slice/Ice/com/zeroc/Ice/LogMessage.java
index dbd0c3d33702..a323ffccb2a0 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 = 1719061823603500557L;
+    private static final long serialVersionUID = 2993352715621815437L;
 }
diff --git a/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java b/slice2java/slice/Ice/com/zeroc/Ice/ProtocolVersion.java
index d421dac50fbc..a40a6d391852 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 = -5405415434996728668L;
+    private static final long serialVersionUID = 6685125891522023044L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java
index 57e790c11826..62188d850618 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AccessDeniedException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5447245798790693443L;
+    private static final long serialVersionUID = 5447243698719968912L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDescriptor.java
index 9b5b95406e20..5ba80db369db 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 = 4673858098836216038L;
+    private static final long serialVersionUID = 8448733308400665589L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterDynamicInfo.java
index 7c4d5ebb6a0a..b17346b49f45 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 = 134471076354335856L;
+    private static final long serialVersionUID = 7661454771535746016L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterInfo.java
index d299dbbb8d95..912a1e3519c9 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 = 795191505131951930L;
+    private static final long serialVersionUID = 8518642582734080083L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java
index 17eb5dd81f97..6b1d362aca0c 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdapterNotExistException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -243189254358822069L;
+    private static final long serialVersionUID = -243191333766076520L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdaptiveLoadBalancingPolicy.java
index 3db9f91d9263..e38b8d0281ba 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 = 7644438409898598681L;
+    private static final long serialVersionUID = 7644448234026889514L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/Admin.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/Admin.java
index 26a36e7811da..505fd41ab964 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/Admin.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/Admin.java
@@ -252,8 +252,8 @@ boolean isServerEnabled(String id, com.zeroc.Ice.Current current)
      * @throws ServerStartException Raised if the server couldn't be started.
      **/
     java.util.concurrent.CompletionStage<Void> startServerAsync(String id, com.zeroc.Ice.Current current)
-        throws ServerNotExistException,
-               ServerStartException,
+        throws ServerStartException,
+               ServerNotExistException,
                DeploymentException,
                NodeUnreachableException;
 
@@ -268,8 +268,8 @@ java.util.concurrent.CompletionStage<Void> startServerAsync(String id, com.zeroc
      * @throws ServerStopException Raised if the server couldn't be stopped.
      **/
     java.util.concurrent.CompletionStage<Void> stopServerAsync(String id, com.zeroc.Ice.Current current)
-        throws ServerNotExistException,
-               ServerStopException,
+        throws ServerStopException,
+               ServerNotExistException,
                DeploymentException,
                NodeUnreachableException;
 
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdminPrx.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdminPrx.java
index 81848e52e3cb..4ed09d045ad2 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdminPrx.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AdminPrx.java
@@ -1613,8 +1613,8 @@ default com.zeroc.Ice.OutgoingAsync<java.lang.Boolean> _iceI_isServerEnabledAsyn
      * @throws ServerStartException Raised if the server couldn't be started.
      **/
     default void startServer(String id)
-        throws ServerNotExistException,
-               ServerStartException,
+        throws ServerStartException,
+               ServerNotExistException,
                DeploymentException,
                NodeUnreachableException
     {
@@ -1631,8 +1631,8 @@ default void startServer(String id)
      * @throws ServerStartException Raised if the server couldn't be started.
      **/
     default void startServer(String id, java.util.Map<String, String> context)
-        throws ServerNotExistException,
-               ServerStartException,
+        throws ServerStartException,
+               ServerNotExistException,
                DeploymentException,
                NodeUnreachableException
     {
@@ -1640,11 +1640,11 @@ default void startServer(String id, java.util.Map<String, String> context)
         {
             _iceI_startServerAsync(id, context, true).waitForResponseOrUserEx();
         }
-        catch(ServerNotExistException ex)
+        catch(ServerStartException ex)
         {
             throw ex;
         }
-        catch(ServerStartException ex)
+        catch(ServerNotExistException ex)
         {
             throw ex;
         }
@@ -1702,8 +1702,8 @@ default com.zeroc.Ice.OutgoingAsync<Void> _iceI_startServerAsync(String iceP_id,
     /** @hidden */
     static final Class<?>[] _iceE_startServer =
     {
-        ServerNotExistException.class,
         ServerStartException.class,
+        ServerNotExistException.class,
         DeploymentException.class,
         NodeUnreachableException.class
     };
@@ -1717,8 +1717,8 @@ default com.zeroc.Ice.OutgoingAsync<Void> _iceI_startServerAsync(String iceP_id,
      * @throws ServerStopException Raised if the server couldn't be stopped.
      **/
     default void stopServer(String id)
-        throws ServerNotExistException,
-               ServerStopException,
+        throws ServerStopException,
+               ServerNotExistException,
                DeploymentException,
                NodeUnreachableException
     {
@@ -1735,8 +1735,8 @@ default void stopServer(String id)
      * @throws ServerStopException Raised if the server couldn't be stopped.
      **/
     default void stopServer(String id, java.util.Map<String, String> context)
-        throws ServerNotExistException,
-               ServerStopException,
+        throws ServerStopException,
+               ServerNotExistException,
                DeploymentException,
                NodeUnreachableException
     {
@@ -1744,11 +1744,11 @@ default void stopServer(String id, java.util.Map<String, String> context)
         {
             _iceI_stopServerAsync(id, context, true).waitForResponseOrUserEx();
         }
-        catch(ServerNotExistException ex)
+        catch(ServerStopException ex)
         {
             throw ex;
         }
-        catch(ServerStopException ex)
+        catch(ServerNotExistException ex)
         {
             throw ex;
         }
@@ -1806,8 +1806,8 @@ default com.zeroc.Ice.OutgoingAsync<Void> _iceI_stopServerAsync(String iceP_id,
     /** @hidden */
     static final Class<?>[] _iceE_stopServer =
     {
-        ServerNotExistException.class,
         ServerStopException.class,
+        ServerNotExistException.class,
         DeploymentException.class,
         NodeUnreachableException.class
     };
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java
index 94690de15749..c5b3a562484d 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/AllocationException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4699853707881491715L;
+    private static final long serialVersionUID = 4699857062980668368L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationDescriptor.java
index 3ff8c07ccf0a..7a7d84a26167 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 = 376967402734278227L;
+    private static final long serialVersionUID = -4890418126659250578L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationInfo.java
index 2f995e23a38b..0b6f58521eb6 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 = 7362741510730550067L;
+    private static final long serialVersionUID = 1343114013201506180L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java
index 2fbda3d1714d..65d5a5f3e0bb 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationNotExistException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7270579281624420916L;
+    private static final long serialVersionUID = -7270581353158538465L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateDescriptor.java
index 164e3c4e90e6..e1849fce91df 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 = -6415834876864867745L;
+    private static final long serialVersionUID = -3837888278576408133L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ApplicationUpdateInfo.java
index 6c76f10336a1..22ee1356ee78 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 = -8646211193860935469L;
+    private static final long serialVersionUID = 2553706426921150324L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java
index f2ee36d8fcd1..ee87aeaa9f4d 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BadSignalException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4463361149325937322L;
+    private static final long serialVersionUID = 4463359067340347129L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedDistributionDescriptor.java
index f15de81fe2cc..9045d337010b 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 = -1971531173673329713L;
+    private static final long serialVersionUID = -1971523986644378669L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/BoxedString.java
index 6a4ed379fa99..8c502e1249b9 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 = -2108805501907263554L;
+    private static final long serialVersionUID = -2108809545567272819L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/CommunicatorDescriptor.java
index b8180a7d6993..4f14dd293247 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 = 4151989362462445530L;
+    private static final long serialVersionUID = 785533145217901516L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java
index b5a820a0b1ff..d97d231e8753 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DeploymentException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6801510348223056182L;
+    private static final long serialVersionUID = -6801506980057280103L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/DistributionDescriptor.java
index 3f468276cd03..cdec4dc36dbb 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 = 3811327554982257230L;
+    private static final long serialVersionUID = 7302670633787027710L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java
index 1f6f24906386..eff621b43e28 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/FileNotAvailableException.java
@@ -66,5 +66,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8985154512075319687L;
+    private static final long serialVersionUID = -8985157874900295766L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/IceBoxDescriptor.java
index 7a2f4df8784d..5d2828662793 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 = 2337756766314255520L;
+    private static final long serialVersionUID = 2337763622725079826L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadBalancingPolicy.java
index 3b5f3be8acfd..949566d6ab33 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 = -6003729408933284756L;
+    private static final long serialVersionUID = -6003728498218527649L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/LoadInfo.java
index 29d314c90dfc..77ce50fc5e79 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 = 6665703055823976832L;
+    private static final long serialVersionUID = -7669797801889296353L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDescriptor.java
index 9df8eb138b0a..8854956df7f3 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 = 628922586609320438L;
+    private static final long serialVersionUID = -2975206543084449618L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeDynamicInfo.java
index 268cb6e0e86b..1d5b5f3474ef 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 = 3768806052330609775L;
+    private static final long serialVersionUID = 8297933933332462859L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeInfo.java
index 16d77c61af30..6a699a6563db 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 = -3922232418500390833L;
+    private static final long serialVersionUID = -4018184448834877864L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java
index 2830c2664202..2ea43fd17d3c 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeNotExistException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5774526661161844842L;
+    private static final long serialVersionUID = -5774530042081163323L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java
index b1e1f389a759..a3f3b831ceb9 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUnreachableException.java
@@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -250447704462887004L;
+    private static final long serialVersionUID = 5542846931470181540L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/NodeUpdateDescriptor.java
index f030a75666d6..e65f2f937d78 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 = -2869445231922849946L;
+    private static final long serialVersionUID = -6784927570927107986L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectDescriptor.java
index fa943c2ebeeb..a0dac3146ede 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 = 4037757899599447472L;
+    private static final long serialVersionUID = 518892885806814740L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java
index d09917e4fb66..f770693bbabd 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectExistsException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 6991427764561789601L;
+    private static final long serialVersionUID = 6991431145619389178L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectInfo.java
index 328a1bf450dc..1ee33a0446e0 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 = 2575975503772758482L;
+    private static final long serialVersionUID = 249804084728010402L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java
index af03a26b25c2..e1c8bffe461f 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObjectNotRegisteredException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7672374283197080252L;
+    private static final long serialVersionUID = 7672376352143797479L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java
index 9113f2ebb5c6..d2b7a78f66be 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ObserverAlreadyRegisteredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2733101965357985778L;
+    private static final long serialVersionUID = 2733104070437909033L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java
index eb831780d88f..51323c7eed6c 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ParseException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5694234862099169042L;
+    private static final long serialVersionUID = -5694240666006312661L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java
index 1c6606078121..6bdc3c25dfe9 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PermissionDeniedException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7526799998798079583L;
+    private static final long serialVersionUID = 7526796646139101324L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertyDescriptor.java
index 1459fce1f346..11b28e108cb0 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 = 598693590915049924L;
+    private static final long serialVersionUID = 3793371808246247652L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/PropertySetDescriptor.java
index b5a0674b3468..91f8566f89e5 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 = -2659297555383485391L;
+    private static final long serialVersionUID = 5491727442261832129L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryInfo.java
index 3cf79035d981..5b212a2ac890 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 = 5736491687117957799L;
+    private static final long serialVersionUID = 8960321658437862887L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java
index 4c7402a5b4ec..eae7d645fdba 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryNotExistException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8544187724140242915L;
+    private static final long serialVersionUID = 8544191074220884912L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java
index f0fc14a8ddd4..c4c1785edfd5 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/RegistryUnreachableException.java
@@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2713288780053935217L;
+    private static final long serialVersionUID = 2609208479587632753L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ReplicaGroupDescriptor.java
index e86af8d003c3..c0c4e08688d0 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 = 1027738211051911017L;
+    private static final long serialVersionUID = 7547255609340348406L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDescriptor.java
index 50e138f68bf7..a42fed45a819 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 = -4316564856737207665L;
+    private static final long serialVersionUID = -7935268804810742285L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerDynamicInfo.java
index 3d7810f06399..d51717e3cb09 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 = -7893803747354492268L;
+    private static final long serialVersionUID = -964651276232247348L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInfo.java
index 24937993321d..7508b93cf535 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 = 9148474141987612252L;
+    private static final long serialVersionUID = -1809552904335609296L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerInstanceDescriptor.java
index a9c6f7b4ae45..bb9a4d4c90d3 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 = -6629815688167941561L;
+    private static final long serialVersionUID = -5975843409679861727L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java
index 6b0947552565..599ca30438f7 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerNotExistException.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2699426175643304391L;
+    private static final long serialVersionUID = -2699424083307579158L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java
index ceae1e33d4ce..9702b30b33d8 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStartException.java
@@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3504214301477122169L;
+    private static final long serialVersionUID = 6765412121660596487L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java
index 528302c7b1c8..95aa1d4c678c 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerStopException.java
@@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4200168890060820609L;
+    private static final long serialVersionUID = -498008490273307009L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java
index 8e4b4303e457..604294944ce6 100644
--- a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java
+++ b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServerUnreachableException.java
@@ -68,5 +68,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2065187221311393055L;
+    private static final long serialVersionUID = 4198320345718525153L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceDescriptor.java
index 16e815327589..48dbd3068e97 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 = -744756845519044583L;
+    private static final long serialVersionUID = 8027100686610867897L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/ServiceInstanceDescriptor.java
index 54fe448c04c6..5de47f5e509e 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 = 7904434526308363119L;
+    private static final long serialVersionUID = 8932687218785450501L;
 }
diff --git a/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java b/slice2java/slice/IceGrid/com/zeroc/IceGrid/TemplateDescriptor.java
index c778e48125a3..0ca39e1b25b9 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 = -1194290134332759349L;
+    private static final long serialVersionUID = -460070089962063737L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java
index 4eaddc2672c5..c82cd9cb5c8e 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/BadQoS.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7896653924411606510L;
+    private static final long serialVersionUID = 7896660765125388734L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/IceMX/SubscriberMetrics.java
index 845b13493f58..6b4fc1d88c96 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 = 5686308817727140872L;
+    private static final long serialVersionUID = -340728943491214005L;
 
     /** @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 114d2f2a04e5..0a39c3bf4a8b 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 = 630852250660625089L;
+    private static final long serialVersionUID = -995724483085630559L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java
index 61d98f2b8132..1627306535bc 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/InvalidSubscriber.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1090061213377352497L;
+    private static final long serialVersionUID = -1090057182897870817L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java
index 0231bf377653..3933dcc452b7 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkExists.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 243155907633400039L;
+    private static final long serialVersionUID = 243154317947876407L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/LinkInfo.java
index 5fd3604dca46..304168dabeda 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 = 2148057155537929402L;
+    private static final long serialVersionUID = 3225262646344282090L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java
index bd037f7cc73b..8f3cdbb11158 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchLink.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8653870389652424181L;
+    private static final long serialVersionUID = -8653877434498648613L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java
index bd4433830fd6..7ddbaa8daa90 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/NoSuchTopic.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6283739246591720662L;
+    private static final long serialVersionUID = -6283743481203644550L;
 }
diff --git a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java
index 7a6bdc432c7e..f15bb544c05a 100644
--- a/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java
+++ b/slice2java/slice/IceStorm/com/zeroc/IceStorm/TopicExists.java
@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3979362724945877894L;
+    private static final long serialVersionUID = 3979364110498959318L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Base.java b/slice2java/swift/test/Ice/defaultValue/Test/Base.java
index d8f1bdb50351..a3ecbb9103de 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 = -118859047199209722L;
+    private static final long serialVersionUID = 5911078511167310421L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java
index 41806c75f450..2ec69819dc3e 100644
--- a/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java
+++ b/slice2java/swift/test/Ice/defaultValue/Test/BaseEx.java
@@ -143,5 +143,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8438901791379787058L;
+    private static final long serialVersionUID = -7569249672736474271L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Derived.java b/slice2java/swift/test/Ice/defaultValue/Test/Derived.java
index 0cd8751156f3..2706edf30b2d 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 = 4471993381036328502L;
+    private static final long serialVersionUID = -7803256444509275658L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java
index 358d8682843d..6333f0911e09 100644
--- a/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java
+++ b/slice2java/swift/test/Ice/defaultValue/Test/DerivedEx.java
@@ -86,5 +86,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 43356570403029505L;
+    private static final long serialVersionUID = 2818562280194452289L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct1.java
index de4ce232cb00..9b5747a2e050 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 = -2051664506195160496L;
+    private static final long serialVersionUID = 2622371116300736323L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct2.java
index b99b7e94418d..c41c4db40d8e 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 = 7492699678643793161L;
+    private static final long serialVersionUID = 5089655348817864575L;
 }
diff --git a/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java b/slice2java/swift/test/Ice/defaultValue/Test/Struct3.java
index fac2ffe583c5..06b9e2b3e323 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 = 7651828228315498066L;
+    private static final long serialVersionUID = -4664654987560826687L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/A.java b/slice2java/swift/test/Ice/exceptions/Test/A.java
index 0d4488a8bd96..8acd2df1e54b 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/A.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/A.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7823745307932025098L;
+    private static final long serialVersionUID = 7823740610887851055L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/B.java b/slice2java/swift/test/Ice/exceptions/Test/B.java
index 8a4262003664..12763cc7fe8a 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/B.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/B.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3861410590580129718L;
+    private static final long serialVersionUID = -3861420742936802705L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/C.java b/slice2java/swift/test/Ice/exceptions/Test/C.java
index cef2f572be55..7d50421822f7 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/C.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/C.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1080698999134810378L;
+    private static final long serialVersionUID = 1080694302090636335L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/D.java b/slice2java/swift/test/Ice/exceptions/Test/D.java
index a8734484bb1d..f38e15d66f33 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/D.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/D.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4780381677521948490L;
+    private static final long serialVersionUID = 4780371525165275503L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/E.java b/slice2java/swift/test/Ice/exceptions/Test/E.java
index b3b03ff44549..08c5c6de1d05 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/E.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/E.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1876968069435582318L;
+    private static final long serialVersionUID = -1876979334775090344L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/F.java b/slice2java/swift/test/Ice/exceptions/Test/F.java
index 2cea0a082207..f85a1817450d 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/F.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/F.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 733475410135103505L;
+    private static final long serialVersionUID = 733469512290720603L;
 }
diff --git a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java
index dfc714ccb7bb..fad1d419d878 100644
--- a/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java
+++ b/slice2java/swift/test/Ice/exceptions/Test/Mod/A.java
@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4641413557423279458L;
+    private static final long serialVersionUID = -4641408948042527301L;
 }
diff --git a/slice2java/swift/test/Ice/inheritance/Test/MC/A.java b/slice2java/swift/test/Ice/inheritance/Test/MC/A.java
index 2d0dbcce828d..0fc4f466dc8d 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 = 954227840605403720L;
+    private static final long serialVersionUID = 954232901625966111L;
 
     /** @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 4e7274282371..cefbda54dcf5 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 = 1339637686074948818L;
+    private static final long serialVersionUID = 1339629832421377157L;
 
     /** @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 d29004b0d278..b994554818cf 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 = -2729308050368105520L;
+    private static final long serialVersionUID = -2729304993704731257L;
 
     /** @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 9b4fac6bc931..c374280375e8 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 = -3435405403855512362L;
+    private static final long serialVersionUID = -3435402026893850751L;
 
     /** @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 ac24312aecce..32621b73eb72 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 = -836180072435673649L;
+    private static final long serialVersionUID = -836177508938642792L;
 
     /** @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 9517b2f451ac..70e3987f5608 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 = 1132531943589703154L;
+    private static final long serialVersionUID = 1132524084931405349L;
 
     /** @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 71edc70abf92..6719855eddaf 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 = -6335551433007318288L;
+    private static final long serialVersionUID = -6335559291670072281L;
 
     /** @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 59484f7e9a13..1f937e77e767 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 = -4007411649959297802L;
+    private static final long serialVersionUID = -4007408278002362335L;
 
     /** @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 1f2bc628ffe5..d8cae755f5f1 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 = 991421508401007438L;
+    private static final long serialVersionUID = 991426889719857177L;
 
     /** @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 c73ee614a5ac..3fabfb212533 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 = -2880330261053858926L;
+    private static final long serialVersionUID = -2880332824555633467L;
 
     /** @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 3c7ba9af205d..64f327ab5caa 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 = -8808269212890336624L;
+    private static final long serialVersionUID = -8808271776387367481L;
 
     /** @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 606f9321690b..ecc44a598bce 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 = -771860150426874730L;
+    private static final long serialVersionUID = -771851483313415999L;
 
     /** @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 a951c4dece9b..2b6a7da8de69 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 = 6566350198564502477L;
+    private static final long serialVersionUID = 6566352762066277018L;
 
     /** @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 e53f5a55a806..5abd1971cc2d 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 = 6983808858414459314L;
+    private static final long serialVersionUID = 6983795379586556517L;
 
     /** @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 6f71e37e9dcb..565adc673535 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 = -1175215612546253904L;
+    private static final long serialVersionUID = -1175218181048010905L;
 
     /** @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 3530c25d7b7d..d83dbb54e6cc 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 = -3279719948151518282L;
+    private static final long serialVersionUID = -3279722196364187807L;
 
     /** @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 0bfa735201f4..86808fe9146e 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 = -4359184480118075316L;
+    private static final long serialVersionUID = -4359168188482279653L;
 
     /** @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 63cf14a68659..0da6b4c77fc6 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 = 5904694473626336850L;
+    private static final long serialVersionUID = 5904686619972765189L;
 
     /** @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 d2697e5b5585..918be54024cc 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 = 1835748737183282512L;
+    private static final long serialVersionUID = 1835751793846656775L;
 
     /** @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 b798ff5d8e86..a653617fa8c8 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 = -2252406057085829546L;
+    private static final long serialVersionUID = -2252402680124167935L;
 
     /** @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 b47eba41e22a..80ece6d02888 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 = -1203526912863673405L;
+    private static final long serialVersionUID = -1203536261876946028L;
 
     /** @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 c8c96d10f3c4..16fa54acd9a5 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 = -7537760087997581966L;
+    private static final long serialVersionUID = -7537767946655879771L;
 
     /** @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 5527948cca47..d5f9b8321151 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 = 3440900609114948208L;
+    private static final long serialVersionUID = 3440892750452194215L;
 
     /** @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 7a656fa68404..43201c9c43c1 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 = 9151097832944673910L;
+    private static final long serialVersionUID = 9151101204901609377L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/A.java b/slice2java/swift/test/Ice/objects/Test/A.java
index d15a99100f81..674f6c2cf8ec 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 = 2432987981495809555L;
+    private static final long serialVersionUID = -6797943838771811557L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/A1.java b/slice2java/swift/test/Ice/objects/Test/A1.java
index 0772bf877609..fed0aea50676 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 = -5926741724482096915L;
+    private static final long serialVersionUID = -5926745922963969033L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/B.java b/slice2java/swift/test/Ice/objects/Test/B.java
index 4b0db61111d9..2a1a452e3886 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 = -8890920337992897252L;
+    private static final long serialVersionUID = -8890918288571613009L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/B1.java b/slice2java/swift/test/Ice/objects/Test/B1.java
index c8280419eb20..f18e8102a699 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 = 8577477921580079428L;
+    private static final long serialVersionUID = 1582311717810981764L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Base.java b/slice2java/swift/test/Ice/objects/Test/Base.java
index 70a04d961530..1b8ce3819723 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 = 4383575365246900592L;
+    private static final long serialVersionUID = 5228570043918766986L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/BaseEx.java b/slice2java/swift/test/Ice/objects/Test/BaseEx.java
index 126eeda95f75..7ae42ef3bae9 100644
--- a/slice2java/swift/test/Ice/objects/Test/BaseEx.java
+++ b/slice2java/swift/test/Ice/objects/Test/BaseEx.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3897767853957287871L;
+    private static final long serialVersionUID = 3897763621745163045L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/C.java b/slice2java/swift/test/Ice/objects/Test/C.java
index 8d1aff7ffafa..8c44b1dbaace 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 = 1557641431910155098L;
+    private static final long serialVersionUID = 3225520889382432680L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/COneMember.java b/slice2java/swift/test/Ice/objects/Test/COneMember.java
index f796f7ffc1b8..b18e4c6e4d65 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 = 3050973568463625568L;
+    private static final long serialVersionUID = 3050977139600400498L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java b/slice2java/swift/test/Ice/objects/Test/CTwoMembers.java
index a86f2e3de6f4..aa9ffad86634 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 = 4598714062432566427L;
+    private static final long serialVersionUID = -1241987997385943269L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/D.java b/slice2java/swift/test/Ice/objects/Test/D.java
index 6d0bac1f1375..64c3bc48f851 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 = 226873150345307819L;
+    private static final long serialVersionUID = 4725061052696227312L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/D1.java b/slice2java/swift/test/Ice/objects/Test/D1.java
index 5671433d0727..49b15c75be6f 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 = -1040033370581920381L;
+    private static final long serialVersionUID = -1635139384838643517L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Derived.java b/slice2java/swift/test/Ice/objects/Test/Derived.java
index a37477b99017..700c45195b03 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 = -1587930511519042877L;
+    private static final long serialVersionUID = -1587931948995107417L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/E.java b/slice2java/swift/test/Ice/objects/Test/E.java
index 18847648ce4d..9ac1bd9a2b1f 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 = 5010921847121909215L;
+    private static final long serialVersionUID = -5658335572677138149L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/EBase.java b/slice2java/swift/test/Ice/objects/Test/EBase.java
index 0128cc8b1bc0..0910825a2673 100644
--- a/slice2java/swift/test/Ice/objects/Test/EBase.java
+++ b/slice2java/swift/test/Ice/objects/Test/EBase.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7985163121211200754L;
+    private static final long serialVersionUID = 7835415805014414414L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/EDerived.java b/slice2java/swift/test/Ice/objects/Test/EDerived.java
index acc4e980dba6..55ad358a9d96 100644
--- a/slice2java/swift/test/Ice/objects/Test/EDerived.java
+++ b/slice2java/swift/test/Ice/objects/Test/EDerived.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 374323780875248914L;
+    private static final long serialVersionUID = 2077075360268582994L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/EOneMember.java b/slice2java/swift/test/Ice/objects/Test/EOneMember.java
index 818729a56ccc..f405cc1c5569 100644
--- a/slice2java/swift/test/Ice/objects/Test/EOneMember.java
+++ b/slice2java/swift/test/Ice/objects/Test/EOneMember.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -6225288750847603793L;
+    private static final long serialVersionUID = -6225292283088402243L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java
index d4dacd17dd12..fb53953ecc61 100644
--- a/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java
+++ b/slice2java/swift/test/Ice/objects/Test/ETwoMembers.java
@@ -64,5 +64,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -4951343587935018988L;
+    private static final long serialVersionUID = 4713564122457537940L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/F.java b/slice2java/swift/test/Ice/objects/Test/F.java
index 933a08d83f67..ba5eba4802c6 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 = 6790439020811910481L;
+    private static final long serialVersionUID = -1601770192803276079L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/F1.java b/slice2java/swift/test/Ice/objects/Test/F1.java
index 97d612d88c5d..0a8f9ecc9e98 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 = 6192375352291049103L;
+    private static final long serialVersionUID = 6192369658272485852L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/F3.java b/slice2java/swift/test/Ice/objects/Test/F3.java
index 30fea3aa587b..231a48774c05 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 = 6570751051862409227L;
+    private static final long serialVersionUID = -8842321789912472829L;
 
     /** @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 f4501c37854c..fad8a62cf8be 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 = -1425256678329741898L;
+    private static final long serialVersionUID = -1425260915769651899L;
 
     /** @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 de1db237d45e..8f70ac96815a 100644
--- a/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java
+++ b/slice2java/swift/test/Ice/objects/Test/Inner/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2337228144506858028L;
+    private static final long serialVersionUID = -2337229075745089330L;
 }
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 4d132105cdbf..a9342b8676f6 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 = -1298680196997216864L;
+    private static final long serialVersionUID = -1298679475083372613L;
 
     /** @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 a7e5bfe70d4d..f41789c7cfcb 100644
--- a/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java
+++ b/slice2java/swift/test/Ice/objects/Test/Inner/Sub/Ex.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1842234035234450928L;
+    private static final long serialVersionUID = 1842238228550599274L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/K.java b/slice2java/swift/test/Ice/objects/Test/K.java
index 4068cddd47da..50a8d04aa83b 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 = 4645163631410883771L;
+    private static final long serialVersionUID = 4645161878807776421L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/L.java b/slice2java/swift/test/Ice/objects/Test/L.java
index 61fc8c0ca841..df17329b19b2 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 = 6629734676306862310L;
+    private static final long serialVersionUID = 6629739409598932348L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/M.java b/slice2java/swift/test/Ice/objects/Test/M.java
index 3aa822a98ad0..2c3c5dc3e2da 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 = -8088093499379793899L;
+    private static final long serialVersionUID = -8088097532555333058L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/Recursive.java b/slice2java/swift/test/Ice/objects/Test/Recursive.java
index 4fb6edbccbf7..472dac6c7ff3 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 = 3617878724654235311L;
+    private static final long serialVersionUID = 3617877963909740544L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/objects/Test/S.java b/slice2java/swift/test/Ice/objects/Test/S.java
index 049157289cea..c210a0250481 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 = 481770179204992213L;
+    private static final long serialVersionUID = 481772058201061455L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/SOneMember.java b/slice2java/swift/test/Ice/objects/Test/SOneMember.java
index dfb36bc63e06..d6487d3328dc 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 = 6227757125814380601L;
+    private static final long serialVersionUID = 6227753053891777579L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/STwoMembers.java b/slice2java/swift/test/Ice/objects/Test/STwoMembers.java
index 2657e6020f05..b2bfcec3fc0e 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 = -3701293660073255806L;
+    private static final long serialVersionUID = 1474344858709048066L;
 }
diff --git a/slice2java/swift/test/Ice/objects/Test/StructKey.java b/slice2java/swift/test/Ice/objects/Test/StructKey.java
index 43cd60cbfb0b..4ec62538f191 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 = -8165617932115130989L;
+    private static final long serialVersionUID = -3091333649364668969L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java b/slice2java/swift/test/Ice/operations/Test/AnotherStruct.java
index 0bcf4da7a429..1da0fed99cf9 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 = 2723846341051793305L;
+    private static final long serialVersionUID = 2723846672887569646L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/MyClass1.java b/slice2java/swift/test/Ice/operations/Test/MyClass1.java
index a130180ea16a..4d565c67b31a 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 = -3334825484406230431L;
+    private static final long serialVersionUID = -3200859161316920164L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct.java b/slice2java/swift/test/Ice/operations/Test/MyStruct.java
index 2cf23a752edb..34c5ec13afcf 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 = 2319552527426755005L;
+    private static final long serialVersionUID = 733043380678647677L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/MyStruct1.java b/slice2java/swift/test/Ice/operations/Test/MyStruct1.java
index 9bb3e270db0c..2cc957ad25f5 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 = -4812008905289822744L;
+    private static final long serialVersionUID = -3853664436013977451L;
 }
diff --git a/slice2java/swift/test/Ice/operations/Test/Structure.java b/slice2java/swift/test/Ice/operations/Test/Structure.java
index cb8c45b79671..d0cfce231350 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 = 7273092640792718757L;
+    private static final long serialVersionUID = 2960547252456861462L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/A.java b/slice2java/swift/test/Ice/optional/Test/A.java
index f993ae1a2910..3511b81b924b 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 = -7811205193325471344L;
+    private static final long serialVersionUID = -4716665618487107056L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/B.java b/slice2java/swift/test/Ice/optional/Test/B.java
index 2ba6a47788ec..a81abcd1bc57 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 = -8637988260571684893L;
+    private static final long serialVersionUID = 6755210109122615907L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/C.java b/slice2java/swift/test/Ice/optional/Test/C.java
index df705659ff99..01f1c3ecf3a5 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 = -8791251586332167555L;
+    private static final long serialVersionUID = -3409397621771023363L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/DerivedException.java b/slice2java/swift/test/Ice/optional/Test/DerivedException.java
index ddceecec1943..f0a8a8f8a607 100644
--- a/slice2java/swift/test/Ice/optional/Test/DerivedException.java
+++ b/slice2java/swift/test/Ice/optional/Test/DerivedException.java
@@ -133,5 +133,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3851425718544528512L;
+    private static final long serialVersionUID = -601614201421792446L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/E.java b/slice2java/swift/test/Ice/optional/Test/E.java
index a1b494198ee7..fd77d015a30c 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 = -1850739403399019926L;
+    private static final long serialVersionUID = -1850742695226764638L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/F.java b/slice2java/swift/test/Ice/optional/Test/F.java
index 8b7ec4ef9d62..4c9559b6c2d6 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 = -6430492871422405991L;
+    private static final long serialVersionUID = -6430489589940491311L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/FixedStruct.java b/slice2java/swift/test/Ice/optional/Test/FixedStruct.java
index e76d8bd42a93..6b4d6a92c425 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 = 1569601253903940491L;
+    private static final long serialVersionUID = 1569604700757616991L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/G.java b/slice2java/swift/test/Ice/optional/Test/G.java
index 2c2025ef5da7..473537ab6ae4 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 = -3016784634563243821L;
+    private static final long serialVersionUID = 7429360482774122963L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/G1.java b/slice2java/swift/test/Ice/optional/Test/G1.java
index 52a15e334648..a7b5cca61b95 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 = 7339784558112755342L;
+    private static final long serialVersionUID = 7339781121646998988L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/G2.java b/slice2java/swift/test/Ice/optional/Test/G2.java
index 7a368b76918a..89e6296671da 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 = 3824551189285656808L;
+    private static final long serialVersionUID = 3824547918121230428L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/MultiOptional.java b/slice2java/swift/test/Ice/optional/Test/MultiOptional.java
index 86dd6337b16d..9d5c2b9824dd 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 = -6287048438661541989L;
+    private static final long serialVersionUID = 7453382213440042874L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/OneOptional.java b/slice2java/swift/test/Ice/optional/Test/OneOptional.java
index f28611b9a03b..fdf541b32107 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 = -7219599013356067291L;
+    private static final long serialVersionUID = -7219601176648308623L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalException.java b/slice2java/swift/test/Ice/optional/Test/OptionalException.java
index 41d46480e4d4..b6dc5530c8d6 100644
--- a/slice2java/swift/test/Ice/optional/Test/OptionalException.java
+++ b/slice2java/swift/test/Ice/optional/Test/OptionalException.java
@@ -186,5 +186,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4827529200234281774L;
+    private static final long serialVersionUID = -5112794865695978417L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java b/slice2java/swift/test/Ice/optional/Test/OptionalWithCustom.java
index 3956df231782..c82e4c0fbeed 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 = -541947658550469957L;
+    private static final long serialVersionUID = -6999864782819813957L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/optional/Test/RequiredException.java b/slice2java/swift/test/Ice/optional/Test/RequiredException.java
index 50fb893a5d43..96009baef00b 100644
--- a/slice2java/swift/test/Ice/optional/Test/RequiredException.java
+++ b/slice2java/swift/test/Ice/optional/Test/RequiredException.java
@@ -62,5 +62,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2894238599655806535L;
+    private static final long serialVersionUID = 2894235142524210181L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/SmallStruct.java b/slice2java/swift/test/Ice/optional/Test/SmallStruct.java
index 0250652ed88c..950936b854dd 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 = 6700987681492946729L;
+    private static final long serialVersionUID = 6700991149093727484L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/VarStruct.java b/slice2java/swift/test/Ice/optional/Test/VarStruct.java
index 7110d9849265..b2355f5a8620 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 = -1912284288807935994L;
+    private static final long serialVersionUID = -1912287745937162428L;
 }
diff --git a/slice2java/swift/test/Ice/optional/Test/WD.java b/slice2java/swift/test/Ice/optional/Test/WD.java
index 7c8fdf406dce..f4527576d276 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 = -7902670991044042357L;
+    private static final long serialVersionUID = 8149225652420888221L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C.java b/slice2java/swift/test/Ice/scope/Test/C.java
index 91beb5d3490c..6b5d79dfda6c 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 = -5190244058063404022L;
+    private static final long serialVersionUID = -5190248370370977770L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C1.java b/slice2java/swift/test/Ice/scope/Test/C1.java
index 8fcd41c1dce7..a1659c23ea0f 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 = 8893234935058991656L;
+    private static final long serialVersionUID = 8893234794347092660L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/scope/Test/C2.java b/slice2java/swift/test/Ice/scope/Test/C2.java
index d2985325b0e3..9e7b9c901a9b 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 = 2485379477476582310L;
+    private static final long serialVersionUID = 1493501599461028026L;
 
     /** @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 4645b60a70c7..0467e85d95f2 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 = 4615627890698564659L;
+    private static final long serialVersionUID = 4615626747826192559L;
 
     /** @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 2c8922f922a5..b15239cd3cd3 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 = 672588124084793894L;
+    private static final long serialVersionUID = 672593438560663098L;
 
     /** @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 b6b4acef35b5..7e0e4518546b 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 = 8654437534188955494L;
+    private static final long serialVersionUID = 8654437674900608506L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/Inner/S.java b/slice2java/swift/test/Ice/scope/Test/Inner/S.java
index 779a7981e0e9..de793febd227 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 = 3694613905745963690L;
+    private static final long serialVersionUID = 3694620503760070838L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S.java b/slice2java/swift/test/Ice/scope/Test/S.java
index fde57f806055..15b4181f3b5b 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 = 2159702171616062868L;
+    private static final long serialVersionUID = 2159701028762656776L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S1.java b/slice2java/swift/test/Ice/scope/Test/S1.java
index 60775a04fdb5..ff6549a46aae 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 = 1241683600148066449L;
+    private static final long serialVersionUID = 1241678605983320717L;
 }
diff --git a/slice2java/swift/test/Ice/scope/Test/S2.java b/slice2java/swift/test/Ice/scope/Test/S2.java
index d78be04af5db..84dfb76f5cdc 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 = 6954106468835187423L;
+    private static final long serialVersionUID = -2353454748719581117L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java
index 95cf6e61a9e2..06acabb2b164 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/Base.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -477021756411342532L;
+    private static final long serialVersionUID = -477021394792304819L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java
index 8d79c0cc63dc..ab06924c1f0a 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3485210853874878554L;
+    private static final long serialVersionUID = 3485211380805858539L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
index 151c5c7ce47a..9c4a0baabc2f 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1717376034651576619L;
+    private static final long serialVersionUID = 1717374825696867610L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
index 2584dc9ee242..e9785d3c7df8 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/KnownMostDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -7384921961007996494L;
+    private static final long serialVersionUID = -7384920922665192381L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java
index b8ad5525411e..22e3c8dc778b 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownDerived.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3424380170418901661L;
+    private static final long serialVersionUID = 3424382437006558355L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
index 8d54c997c28e..e97a467bc95d 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownIntermediate.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1172598079160430516L;
+    private static final long serialVersionUID = -1172594529005377854L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
index a2b443c51b74..93af498a2796 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived1.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1126108710087142475L;
+    private static final long serialVersionUID = -1126112580535725765L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
index fca19a162c09..3da1ed17432a 100644
--- a/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
+++ b/slice2java/swift/test/Ice/slicing/exceptions/Test/UnknownMostDerived2.java
@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2097572885104278379L;
+    private static final long serialVersionUID = -2097571300392160613L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/B.java b/slice2java/swift/test/Ice/slicing/objects/Test/B.java
index a0d98441042c..5d9d3dc61582 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 = -1406923654343538886L;
+    private static final long serialVersionUID = -4686775445036244426L;
 
     /** @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 bb0a1880d06a..c456c784645b 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/BaseException.java
@@ -65,5 +65,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 433325626659885686L;
+    private static final long serialVersionUID = -9067733326990273158L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java b/slice2java/swift/test/Ice/slicing/objects/Test/CompactPCDerived.java
index 46b72b1ae7e9..0c44ea597a9e 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 = -6397001777065487522L;
+    private static final long serialVersionUID = -6397006129540357117L;
 
     /** @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 8057001ff040..c423ce38297d 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 = -9066880535285120498L;
+    private static final long serialVersionUID = -9066880535281739031L;
 
     /** @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 78b09d6d04b1..e33b995e1c02 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 = 7900333383114700793L;
+    private static final long serialVersionUID = -1195429598566105803L;
 
     /** @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 cf4ccec76b78..9e78e9f9b29a 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 = 3445929375262986666L;
+    private static final long serialVersionUID = 8174924036840245296L;
 
     /** @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 1549e260bba5..2451c23903dc 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 = 8763648456623398393L;
+    private static final long serialVersionUID = 4764187547110996625L;
 
     /** @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 5d0915a7a29e..85d4205be6f0 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 = 2973061016157900467L;
+    private static final long serialVersionUID = -8168009958008696845L;
 
     /** @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 2c1a469b2ebd..499aa00729b9 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/DerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7262177211327371897L;
+    private static final long serialVersionUID = 6769125058132617038L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java b/slice2java/swift/test/Ice/slicing/objects/Test/Forward.java
index 611fe8372286..fb80b4deeaa9 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 = -7655923699576171285L;
+    private static final long serialVersionUID = -7655923699524359550L;
 
     /** @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 5e0bb103584e..7d79830eb5a0 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 = -2271128160319163089L;
+    private static final long serialVersionUID = -2271128160322119606L;
 
     /** @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 a8ede86e3e44..c732df7aaa82 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 = 4147532741760181962L;
+    private static final long serialVersionUID = 4147524763119233206L;
 
     /** @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 1cd852fff6aa..6135b5c1ab05 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 = 481713891849068031L;
+    private static final long serialVersionUID = 481713891889079493L;
 
     /** @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 bdca559ef15e..d2e809b4cb50 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 = -4426886969360701538L;
+    private static final long serialVersionUID = -4426891156376012349L;
 
     /** @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 de5a715d91a3..559d13245914 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 = 850538349270481878L;
+    private static final long serialVersionUID = 850542701432044374L;
 
     /** @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 dcd437191b7c..273f14954139 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 = -4328898705005889764L;
+    private static final long serialVersionUID = -4328900011932418310L;
 
     /** @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 897183dbc2a1..2cec0d0a44ce 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 = -5081818494240851348L;
+    private static final long serialVersionUID = -5081814627597413885L;
 
     /** @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 f2d1bd0e2205..ca1c865b5976 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 = 643085531167564041L;
+    private static final long serialVersionUID = 643085531164043310L;
 
     /** @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 a9320efc4445..8d85282098da 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 = -2438013836459077435L;
+    private static final long serialVersionUID = -2438013836257964192L;
 
     /** @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 cf5c1b0b0590..8da953583d75 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 = 4402826693133971563L;
+    private static final long serialVersionUID = -4752818761367793134L;
 
     /** @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 0758d8c6cd0f..2782e584d99c 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 = -8813705678913795433L;
+    private static final long serialVersionUID = -8813708037022603240L;
 
     /** @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 513223c03967..1ff6f75a129e 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 = 3651529272969234346L;
+    private static final long serialVersionUID = 3651529272963213904L;
 
     /** @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 b3c5d7c0a8c2..e53039fd2cf4 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 = 8804382325004348303L;
+    private static final long serialVersionUID = 8804382324991288565L;
 
     /** @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 aa7c3eb2ec14..e22ca4b038fd 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 = -4989065668129618561L;
+    private static final long serialVersionUID = -4989057694587693992L;
 
     /** @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 e01c5cbfb198..3848610b8d2c 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 = -5353761736395856839L;
+    private static final long serialVersionUID = -5353761736399610109L;
 
     /** @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 19b70e5ee125..09a2c1f3abbd 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 = -6522139909370162096L;
+    private static final long serialVersionUID = -6522139909416334605L;
 
     /** @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 80a5df7f6627..a48f7c3f7e3e 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 = 7620288007387084115L;
+    private static final long serialVersionUID = 7620288007488176944L;
 
     /** @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 3c997f17c5cd..ffe182c8e694 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 = 7048772502371347015L;
+    private static final long serialVersionUID = 1772759220496445789L;
 }
diff --git a/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java b/slice2java/swift/test/Ice/slicing/objects/Test/SUnknown.java
index d6cf7ffa9240..3b5615660a36 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 = 612988329808485163L;
+    private static final long serialVersionUID = -939777452252269145L;
 
     /** @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 6250f3eb0a3c..c8cb6e0294b7 100644
--- a/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java
+++ b/slice2java/swift/test/Ice/slicing/objects/Test/UnknownDerivedException.java
@@ -61,5 +61,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 661744680924708311L;
+    private static final long serialVersionUID = 503413393755764355L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/LargeStruct.java b/slice2java/swift/test/Ice/stream/Test/LargeStruct.java
index 01db7933bd2b..85faa998793a 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 = -3029072816158751851L;
+    private static final long serialVersionUID = -1422746272583415903L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/MyClass.java b/slice2java/swift/test/Ice/stream/Test/MyClass.java
index b39f9fe55f48..b825f4ce02ab 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 = 3761348105087893395L;
+    private static final long serialVersionUID = 7703453995335994651L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Ice/stream/Test/MyException.java b/slice2java/swift/test/Ice/stream/Test/MyException.java
index d1666627f243..9fc648b1e33f 100644
--- a/slice2java/swift/test/Ice/stream/Test/MyException.java
+++ b/slice2java/swift/test/Ice/stream/Test/MyException.java
@@ -59,5 +59,5 @@ public boolean _usesClasses()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 5734234803423583818L;
+    private static final long serialVersionUID = 5734225176716488976L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/OptionalClass.java b/slice2java/swift/test/Ice/stream/Test/OptionalClass.java
index 8d37ad1f156c..23564f468683 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 = -2457328179443128404L;
+    private static final long serialVersionUID = 6655472703489390315L;
 
     /** @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 1822b72d59a7..429d6c1e498b 100644
--- a/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java
+++ b/slice2java/swift/test/Ice/stream/Test/Sub/NestedException.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -1404701256359408988L;
+    private static final long serialVersionUID = -1404702705329081380L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java b/slice2java/swift/test/Ice/stream/Test/Sub/NestedStruct.java
index 999fbf92b153..691942d14e7a 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 = -5497468998492149647L;
+    private static final long serialVersionUID = -5988301550786071986L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java
index 25a0f0822272..b8765b06da2b 100644
--- a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java
+++ b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedException2.java
@@ -53,5 +53,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8562117155761639402L;
+    private static final long serialVersionUID = -8562123889542620114L;
 }
diff --git a/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java b/slice2java/swift/test/Ice/stream/Test2/Sub2/NestedStruct2.java
index 23d0d0873de0..123662caab5d 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 = 466528282734783513L;
+    private static final long serialVersionUID = -282763534798693191L;
 }
diff --git a/slice2java/swift/test/Slice/escape/Clash/Cls.java b/slice2java/swift/test/Slice/escape/Clash/Cls.java
index 40dbd24dc893..653aa7bf099f 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 = 8787175814461230174L;
+    private static final long serialVersionUID = -5660832829694920479L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Slice/escape/Clash/Ex.java b/slice2java/swift/test/Slice/escape/Clash/Ex.java
index ec1befb30968..cfd8ffe1d410 100644
--- a/slice2java/swift/test/Slice/escape/Clash/Ex.java
+++ b/slice2java/swift/test/Slice/escape/Clash/Ex.java
@@ -57,5 +57,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8340751631143535011L;
+    private static final long serialVersionUID = 2281756871460950871L;
 }
diff --git a/slice2java/swift/test/Slice/escape/Clash/St.java b/slice2java/swift/test/Slice/escape/Clash/St.java
index e1c5e2f90914..118ff76a14bf 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 = 6406507670079592043L;
+    private static final long serialVersionUID = 4334911810016274717L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/_return.java b/slice2java/swift/test/Slice/escape/and/_return.java
index ca90766a0ac6..11ed62489d2e 100644
--- a/slice2java/swift/test/Slice/escape/and/_return.java
+++ b/slice2java/swift/test/Slice/escape/and/_return.java
@@ -52,5 +52,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -8206187035364076787L;
+    private static final long serialVersionUID = -8206187278008230489L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/_switch.java b/slice2java/swift/test/Slice/escape/and/_switch.java
index 033fba08ee55..748b95175ee6 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 = -8187243144545927385L;
+    private static final long serialVersionUID = 9067632533711511435L;
 
     /** @hidden */
     @Override
diff --git a/slice2java/swift/test/Slice/escape/and/as.java b/slice2java/swift/test/Slice/escape/and/as.java
index 4d5a3fbcd4b9..b0ca288bcf28 100644
--- a/slice2java/swift/test/Slice/escape/and/as.java
+++ b/slice2java/swift/test/Slice/escape/and/as.java
@@ -60,5 +60,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1955695206681704184L;
+    private static final long serialVersionUID = -73503060251499016L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/defer.java b/slice2java/swift/test/Slice/escape/and/defer.java
index 17ae6a8a2aec..6b102a1c6a3e 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 = 8824799161058044570L;
+    private static final long serialVersionUID = 8824798716798504009L;
 }
diff --git a/slice2java/swift/test/Slice/escape/and/guard.java b/slice2java/swift/test/Slice/escape/and/guard.java
index 35d63675e178..306bd9f13d64 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 = 6403717966212723259L;
+    private static final long serialVersionUID = 6403717689679717457L;
 }
diff --git a/slice2matlab/cpp/src/IceGrid/+IceGrid/InternalRegistryPrx.m b/slice2matlab/cpp/src/IceGrid/+IceGrid/InternalRegistryPrx.m
index f08c940fe828..91e9183a062d 100644
--- a/slice2matlab/cpp/src/IceGrid/+IceGrid/InternalRegistryPrx.m
+++ b/slice2matlab/cpp/src/IceGrid/+IceGrid/InternalRegistryPrx.m
@@ -325,7 +325,7 @@ function shutdown(obj, varargin)
         end
     end
     properties(Constant,Access=private)
-        registerNode_ex_ = { 'IceGrid.NodeActiveException', 'IceGrid.PermissionDeniedException' }
-        registerReplica_ex_ = { 'IceGrid.ReplicaActiveException', 'IceGrid.PermissionDeniedException' }
+        registerNode_ex_ = { 'IceGrid.PermissionDeniedException', 'IceGrid.NodeActiveException' }
+        registerReplica_ex_ = { 'IceGrid.PermissionDeniedException', 'IceGrid.ReplicaActiveException' }
     end
 end
diff --git a/slice2matlab/cpp/test/Ice/exceptions/+Test/ThrowerPrx.m b/slice2matlab/cpp/test/Ice/exceptions/+Test/ThrowerPrx.m
index 859bbd6d1b75..7bc250790047 100644
--- a/slice2matlab/cpp/test/Ice/exceptions/+Test/ThrowerPrx.m
+++ b/slice2matlab/cpp/test/Ice/exceptions/+Test/ThrowerPrx.m
@@ -288,7 +288,7 @@ function throwAfterException(obj, varargin)
     end
     properties(Constant,Access=private)
         throwAasA_ex_ = { 'Test.A' }
-        throwAorDasAorD_ex_ = { 'Test.D', 'Test.A' }
+        throwAorDasAorD_ex_ = { 'Test.A', 'Test.D' }
         throwBasA_ex_ = { 'Test.A' }
         throwCasA_ex_ = { 'Test.A' }
         throwBasB_ex_ = { 'Test.B' }