diff --git a/Assets/ResRaw/Prefabs/Line/fishing line float set.prefab b/Assets/ResRaw/Prefabs/Line/fishing line float set.prefab
index ef0dcbdd2..7c47e0356 100644
--- a/Assets/ResRaw/Prefabs/Line/fishing line float set.prefab	
+++ b/Assets/ResRaw/Prefabs/Line/fishing line float set.prefab	
@@ -749,7 +749,7 @@ MonoBehaviour:
   minPhysicsNodes: 2
   maxPhysicsNodes: 120
   gravityStrength: 6
-  velocityDampen: 0.95
+  velocityDampen: 1
   stiffness: 0.8
   iterations: 10
   initialLength: 0
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/CheckerMaterial.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/CheckerMaterial.mat
index 1eb244097..c882d14f7 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/CheckerMaterial.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/CheckerMaterial.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterial.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterial.mat
index 1de8f7546..031aefa5a 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterial.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterial.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialBlue.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialBlue.mat
index 1811745bd..744922702 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialBlue.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialBlue.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialGreen.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialGreen.mat
index dd2a2e435..0d27c5530 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialGreen.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialGreen.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialGrey.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialGrey.mat
index 3689d4135..5f253d936 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialGrey.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialGrey.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialOrange.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialOrange.mat
index 9c3ba1ac2..28d646b46 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialOrange.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialOrange.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialRed.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialRed.mat
index 7caa858f4..9af159c61 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialRed.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/GridMaterialRed.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/TerrainMaterial.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/TerrainMaterial.mat
index 190e3579a..52b1faf43 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/TerrainMaterial.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Materials/TerrainMaterial.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Models/Character/Materials/hair.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Models/Character/Materials/hair.mat
index 92a225104..9116b493e 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Models/Character/Materials/hair.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Models/Character/Materials/hair.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Models/Character/Materials/skin_.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Models/Character/Materials/skin_.mat
index e72f7040d..a0f708270 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Models/Character/Materials/skin_.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Models/Character/Materials/skin_.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 1.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 1.mat
index 2f0ce9e1c..c248f23f4 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 1.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 2.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 2.mat
index cdcc3e15f..d94352abf 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 2.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 2.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 3.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 3.mat
index c05c44dea..03cb0bea5 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 3.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 3.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 4.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 4.mat
index 70be3df79..45ad89192 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 4.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat 4.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat.mat b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat.mat
index 3a7102dd4..de2470e40 100644
--- a/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat.mat	
+++ b/Assets/Samples/NWH Common Package/14.0.0/Common Base Sample/Vegetation/Trees/TreeMat.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/FlatWaterUnderside.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/FlatWaterUnderside.mat
index 99340a37a..afd2bcb13 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/FlatWaterUnderside.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/FlatWaterUnderside.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/WaterFoam.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/WaterFoam.mat
index 632783197..cd5cb424a 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/WaterFoam.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/WaterFoam.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/WaterSurface.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/WaterSurface.mat
index 2db8c786a..ac8712c13 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/WaterSurface.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/WaterSurface.mat	
@@ -154,4 +154,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/WaterUnderTerrain.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/WaterUnderTerrain.mat
index 0b7606dfe..385de5243 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/WaterUnderTerrain.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Materials/WaterUnderTerrain.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Dock/DockWood01.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Dock/DockWood01.mat
index a874e10bf..69eb2c78b 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Dock/DockWood01.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Dock/DockWood01.mat	
@@ -137,4 +137,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Dock/Materials/3td_DockWood_01.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Dock/Materials/3td_DockWood_01.mat
index 755b07b08..9d3874c39 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Dock/Materials/3td_DockWood_01.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Dock/Materials/3td_DockWood_01.mat	
@@ -136,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/Materials/3td_Stone_08.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/Materials/3td_Stone_08.mat
index 61a046e4f..61048b27a 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/Materials/3td_Stone_08.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/Materials/3td_Stone_08.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/Materials/3td_WhiteBrick_02.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/Materials/3td_WhiteBrick_02.mat
index d61ff569b..d783c7b83 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/Materials/3td_WhiteBrick_02.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/Materials/3td_WhiteBrick_02.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_Brick.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_Brick.mat
index 69512fac2..c22eb2926 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_Brick.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_Brick.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_Door.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_Door.mat
index cac44830d..12c2cddd0 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_Door.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_Door.mat	
@@ -136,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_Glass.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_Glass.mat
index 1c39f5960..eaa4e64de 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_Glass.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_Glass.mat	
@@ -138,4 +138,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_TOP.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_TOP.mat
index 3af3e60a3..641d1250f 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_TOP.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_TOP.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_White.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_White.mat
index c5ebd9da1..12dfa320e 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_White.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/Lighthouse/SR_White.mat	
@@ -136,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/MWood04.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/MWood04.mat
index 5ee81cead..fe83be7e5 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/MWood04.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/MWood04.mat	
@@ -136,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/Materials/3td_MossWood_04.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/Materials/3td_MossWood_04.mat
index e7ed1c668..b305ec9a6 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/Materials/3td_MossWood_04.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/Materials/3td_MossWood_04.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/Materials/3td_planks_03.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/Materials/3td_planks_03.mat
index 2bed47220..9e77f92e6 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/Materials/3td_planks_03.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/Materials/3td_planks_03.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/MetRoof04.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/MetRoof04.mat
index 8f0137b75..3bc022fba 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/MetRoof04.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/MetRoof04.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/Planks03.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/Planks03.mat
index 8087cc9a4..56c7a2731 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/Planks03.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Harbor/WarfStand/Planks03.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Barrel/Materials/Oildrum-refo.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Barrel/Materials/Oildrum-refo.mat
index db9b618b7..43fc73184 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Barrel/Materials/Oildrum-refo.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Barrel/Materials/Oildrum-refo.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -28,7 +28,7 @@ Material:
   - _EMISSION
   - _NORMALMAP
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -130,7 +130,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Bowling Pin/Material.001.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Bowling Pin/Material.001.mat
index b1c5f81cb..c98a1cdfb 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Bowling Pin/Material.001.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Bowling Pin/Material.001.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Bowling Pin/Material.002.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Bowling Pin/Material.002.mat
index 2f41a7f23..eaea30d38 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Bowling Pin/Material.002.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Bowling Pin/Material.002.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Crate/Crate2.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Crate/Crate2.mat
index 36b7bb826..423c02a85 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Crate/Crate2.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Crate/Crate2.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/LifeBuoy/Materials/11 - Default.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/LifeBuoy/Materials/11 - Default.mat
index a33bc2a04..d92430169 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/LifeBuoy/Materials/11 - Default.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/LifeBuoy/Materials/11 - Default.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,11 +129,10 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.21568623, g: 0.21568623, b: 0.21568623, a: 1}
-    - _Color: {r: 0.2156862, g: 0.2156862, b: 0.2156862, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/LifeBuoy/Materials/Leather besh.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/LifeBuoy/Materials/Leather besh.mat
index 83e1e7e5a..9bf883068 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/LifeBuoy/Materials/Leather besh.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/LifeBuoy/Materials/Leather besh.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.6985294, g: 0.25681224, b: 0.25681224, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Pallet/No Name.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Pallet/No Name.mat
index 0f63517f7..a05adbc2a 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Pallet/No Name.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Pallet/No Name.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Pallet/Pallet.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Pallet/Pallet.mat
index 6bcdfda40..7836d8ece 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Pallet/Pallet.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Pallet/Pallet.mat	
@@ -124,7 +124,6 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
-  m_AllowLocking: 1
 --- !u!114 &724687620566047117
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Rubber Duck/Yellow.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Rubber Duck/Yellow.mat
index 107c78484..8c5c70199 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Rubber Duck/Yellow.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/Rubber Duck/Yellow.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/TreeTrunk/TreeTrunkMaterial.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/TreeTrunk/TreeTrunkMaterial.mat
index 07d20fb29..19740e075 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/TreeTrunk/TreeTrunkMaterial.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Props/TreeTrunk/TreeTrunkMaterial.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOBACK.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOBACK.mat
index 22e55b74b..bd500f1fa 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOBACK.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOBACK.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.9338235, g: 0.9338235, b: 0.9338235, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOBRWN.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOBRWN.mat
index 361fe2d83..a47b290e8 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOBRWN.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOBRWN.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOCOMP.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOCOMP.mat
index 71ac9bedc..81f197e94 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOCOMP.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOCOMP.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHODIA1.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHODIA1.mat
index fa6907d3b..cac630ddc 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHODIA1.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHODIA1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHODIA2.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHODIA2.mat
index 036d9c6e8..1091d7f13 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHODIA2.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHODIA2.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOFLAG.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOFLAG.mat
index 21e35e20f..9c9d1b7fa 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOFLAG.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOFLAG.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOLOGO.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOLOGO.mat
index df52587f5..fd8cb3a07 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOLOGO.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOLOGO.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -28,7 +28,7 @@ Material:
   - _EMISSION
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 3000
@@ -132,7 +132,6 @@ Material:
     - _Surface: 1
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOPANL.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOPANL.mat
index 49becba7b..ae8190638 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOPANL.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOPANL.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOSIDE.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOSIDE.mat
index 75a07702a..cd0c7785d 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOSIDE.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOSIDE.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOSONY.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOSONY.mat
index 4a0c91a4e..097538cc0 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOSONY.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOSONY.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOTEXE.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOTEXE.mat
index 27d4b8500..5275fc717 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOTEXE.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOTEXE.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOTHRO.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOTHRO.mat
index edbf3a749..bf1543daf 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOTHRO.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOTHRO.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOWAHO.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOWAHO.mat
index 30e60730e..92ad0deec 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOWAHO.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOWAHO.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -28,7 +28,7 @@ Material:
   - _EMISSION
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 3000
@@ -132,7 +132,6 @@ Material:
     - _Surface: 1
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOWHEL.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOWHEL.mat
index 92d9826b5..0a3d0ecb1 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOWHEL.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOWHEL.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOWOOD.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOWOOD.mat
index 3b1bd4bc6..f4214aef1 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOWOOD.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOWOOD.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.5254902, g: 0.33725488, b: 0.18431368, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHObelC.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHObelC.mat
index b821a9a81..4f4afa740 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHObelC.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHObelC.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.16078427, g: 0.16078427, b: 0.16078427, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHObelt.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHObelt.mat
index 930120d8b..1ff707423 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHObelt.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHObelt.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0, g: 0, b: 0, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOblak.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOblak.mat
index 1aa877679..81ee08ed1 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOblak.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOblak.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.003921569, g: 0.003921569, b: 0.003921569, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOchro.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOchro.mat
index 83d521a9b..b4c67000c 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOchro.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOchro.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.054901943, g: 0.054901943, b: 0.054901943, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOglas.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOglas.mat
index efa039a29..ed0b5bc5c 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOglas.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOglas.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -28,7 +28,7 @@ Material:
   - _EMISSION
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 3000
@@ -132,7 +132,6 @@ Material:
     - _Surface: 1
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 0, g: 0, b: 0.039215688, a: 0.5}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOgren.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOgren.mat
index adeb3a28b..d1477349d 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOgren.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOgren.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.18431368, g: 0.30196077, b: 0.14901957, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOgry1.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOgry1.mat
index 21e526fc8..bc64c9d53 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOgry1.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOgry1.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.007843138, g: 0, b: 0, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOgry2.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOgry2.mat
index b1ae019a3..755c6f5a9 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOgry2.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOgry2.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.19215685, g: 0.19215685, b: 0.19215685, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOred.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOred.mat
index 60b43b371..71bda06f8 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOred.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOred.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.55294114, g: 0, b: 0, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOsea1.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOsea1.mat
index 96f045397..7b467ad14 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOsea1.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOsea1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.49803925, g: 0.49803925, b: 0.49803925, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOsea2.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOsea2.mat
index 5fb14b460..48adc8a66 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOsea2.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOsea2.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.49803925, g: 0.49803925, b: 0.49803925, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOship.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOship.mat
index 3daf911a3..3d72f0713 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOship.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/MotorBoat/Materials/WAHOship.mat	
@@ -16,7 +16,7 @@ Material:
   - _NORMALMAP
   - _OCCLUSIONMAP
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -118,7 +118,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1}
@@ -139,4 +138,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/No Name.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/No Name.mat
index 594d6a7f9..2f9b82eb9 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/No Name.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/No Name.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_bassein.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_bassein.mat
index a1a15bdcb..ed3b8a50b 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_bassein.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_bassein.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_bassein_water.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_bassein_water.mat
index 6d5a48f22..178bb87a4 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_bassein_water.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_bassein_water.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_body.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_body.mat
index d2a04e5a5..0a1462b22 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_body.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_body.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_elda_1.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_elda_1.mat
index 084918ca2..0b7c13f75 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_elda_1.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_elda_1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_elda_2.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_elda_2.mat
index cff414ea1..383a9eb74 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_elda_2.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_elda_2.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_kort.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_kort.mat
index b7c12e5ca..fb09dc02a 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_kort.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_kort.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_l.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_l.mat
index e70a0a43c..72cf4a779 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_l.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_l.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_lodki.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_lodki.mat
index 9a46a65dc..f7185201d 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_lodki.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_lodki.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_lodki_blik.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_lodki_blik.mat
index bee699871..9465b54a4 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_lodki_blik.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_lodki_blik.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_niz.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_niz.mat
index a1941660d..544f9e0dd 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_niz.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_niz.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_nos.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_nos.mat
index e202b9b10..79baa88bd 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_nos.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_nos.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_okna.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_okna.mat
index 7c46ba6ad..e46fda781 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_okna.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_okna.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_paluba.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_paluba.mat
index 07184c631..4a5cf4c57 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_paluba.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_paluba.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_paluba_doski.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_paluba_doski.mat
index a24f15e4d..a86972896 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_paluba_doski.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_paluba_doski.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_truba.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_truba.mat
index 323803840..c8e90dbbc 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_truba.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_truba.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_verh.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_verh.mat
index 0b12d25aa..813f78c3e 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_verh.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_verh.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zabor.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zabor.mat
index 1b92adfe9..81fecb00c 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zabor.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zabor.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zabor_2.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zabor_2.mat
index a5211216c..9b11fa801 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zabor_2.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zabor_2.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zabor_3.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zabor_3.mat
index f02f148a4..dfdf02231 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zabor_3.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zabor_3.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zad.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zad.mat
index 775fb18f9..da09168c3 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zad.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Queen Mary 2/QM_zad.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/650.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/650.mat
index f12f81828..d852a8e68 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/650.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/650.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/AZULPRIN.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/AZULPRIN.mat
index be1c6d11d..4fb325368 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/AZULPRIN.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/AZULPRIN.mat	
@@ -16,7 +16,7 @@ Material:
   - _NORMALMAP
   - _OCCLUSIONMAP
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -118,7 +118,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.8207547, g: 0.8207547, b: 0.8207547, a: 1}
@@ -139,4 +138,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/CROMA.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/CROMA.mat
index 739a9b9b1..9433523c3 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/CROMA.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/CROMA.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.13725486, g: 0.16862741, b: 0.29411763, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/INSTRUM.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/INSTRUM.mat
index e9ec334d9..5527ca33f 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/INSTRUM.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/INSTRUM.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/MERC650.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/MERC650.mat
index 9727a0f37..77715d600 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/MERC650.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/MERC650.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.9044118, g: 0.9044118, b: 0.9044118, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/MERCURY.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/MERCURY.mat
index 710df4ed9..98279e8aa 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/MERCURY.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/MERCURY.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/NEGMT.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/NEGMT.mat
index 58c0f5d12..2e63b36de 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/NEGMT.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/NEGMT.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.007843138, g: 0.003921569, b: 0.003921569, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-7DE.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-7DE.mat
index b5f5a42b2..06463e7af 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-7DE.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-7DE.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.13725486, g: 0.16862741, b: 0.29411763, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-7IZ.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-7IZ.mat
index 3c05f4174..a588c8649 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-7IZ.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-7IZ.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.13725486, g: 0.16862741, b: 0.29411763, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-CRAZU.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-CRAZU.mat
index 90739a0b4..1d79fdf9c 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-CRAZU.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-CRAZU.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.2895761, g: 0.5831465, b: 0.75735295, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-CRIFR.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-CRIFR.mat
index 1ef6d1136..ecb070b16 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-CRIFR.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-CRIFR.mat	
@@ -15,7 +15,7 @@ Material:
   - _EMISSION
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 3000
@@ -119,7 +119,6 @@ Material:
     - _Surface: 1
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 0.011764707, g: 0.019607844, b: 0.015686275, a: 0.5}
@@ -140,4 +139,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-CROMA.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-CROMA.mat
index 0b9eef359..fdf91609c 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-CROMA.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-CROMA.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.03529412, g: 0.03529412, b: 0.058823504, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-GRIS.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-GRIS.mat
index 1e0fe21dd..7041847ba 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-GRIS.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-GRIS.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0, g: 0, b: 0.003921569, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-MTORO.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-MTORO.mat
index ed87b88b5..4f4e55656 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-MTORO.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-MTORO.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.22745097, g: 0.14901957, b: 0.011764707, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-MTORO1.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-MTORO1.mat
index 332598f69..a3ae7092f 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-MTORO1.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-MTORO1.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.22745097, g: 0.14901957, b: 0.011764707, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-PARAB.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-PARAB.mat
index ab50929b0..3593591fd 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-PARAB.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-PARAB.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0, g: 0, b: 0.007843138, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-VOLAN.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-VOLAN.mat
index a125d51a2..07e58e736 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-VOLAN.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SI-VOLAN.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.003921569, g: 0.003921569, b: 0.003921569, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SILVERDE.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SILVERDE.mat
index d953394ac..6e9dafa31 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SILVERDE.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SILVERDE.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.003921569, g: 0.015686275, b: 0.050980374, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SILVERIZ.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SILVERIZ.mat
index c0e6b47d7..8603af365 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SILVERIZ.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Racer/Materials/SILVERIZ.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatChrome.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatChrome.mat
index d8eb9de8c..f8ed1e928 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatChrome.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatChrome.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatChromeMat.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatChromeMat.mat
index 76c12b0bb..2a314158b 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatChromeMat.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatChromeMat.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 3
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0, g: 0.666667, b: 1, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatFrontSailMat.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatFrontSailMat.mat
index 642ef6aa4..4e135b346 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatFrontSailMat.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatFrontSailMat.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatFurnitureMat.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatFurnitureMat.mat
index f21c52da4..0d9b113dc 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatFurnitureMat.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatFurnitureMat.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatHullMat.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatHullMat.mat
index 183de3b37..953d0f08e 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatHullMat.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatHullMat.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatMastMat.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatMastMat.mat
index d2f9b6cb5..fc26d06fc 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatMastMat.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatMastMat.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatPlasticMat.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatPlasticMat.mat
index bbb937f09..7416ded98 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatPlasticMat.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatPlasticMat.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatRearSailMat.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatRearSailMat.mat
index dc750c28a..552a0852c 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatRearSailMat.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatRearSailMat.mat	
@@ -138,4 +138,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatWindowMat.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatWindowMat.mat
index 6646ec278..d258a5740 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatWindowMat.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatWindowMat.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatWoodMat.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatWoodMat.mat
index 8deffe3ea..440b058fc 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatWoodMat.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Sailboat/Materials/SailboatWoodMat.mat	
@@ -138,4 +138,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Submarine/Materials/Submarine Hull.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Submarine/Materials/Submarine Hull.mat
index 923f231a7..44e3e50b3 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Submarine/Materials/Submarine Hull.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Submarine/Materials/Submarine Hull.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Submarine/Materials/Submarine Impeller.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Submarine/Materials/Submarine Impeller.mat
index 5ca7ac760..c5c477973 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Submarine/Materials/Submarine Impeller.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Submarine/Materials/Submarine Impeller.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Submarine/Materials/Sumbnarine Controls.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Submarine/Materials/Sumbnarine Controls.mat
index 88c6e4f3a..e6dce6432 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Submarine/Materials/Sumbnarine Controls.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/Submarine/Materials/Sumbnarine Controls.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/32.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/32.mat
index 2ed45f80d..ceb169328 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/32.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/32.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.027450982, g: 0.027450982, b: 0.027450982, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/5_130.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/5_130.mat
index dd25557b8..fda999d2c 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/5_130.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/5_130.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.36470586, g: 0.44313726, b: 0.454902, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUFLG1.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUFLG1.mat
index 10822cde2..f7c218b05 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUFLG1.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUFLG1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -28,7 +28,7 @@ Material:
   - _EMISSION
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 3000
@@ -132,7 +132,6 @@ Material:
     - _Surface: 1
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 0.26274508, g: 0.25098038, b: 0.21960783, a: 0.70000005}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUFLG2.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUFLG2.mat
index f6af0d358..6ef1fa630 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUFLG2.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUFLG2.mat	
@@ -15,7 +15,7 @@ Material:
   - _EMISSION
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 3000
@@ -119,7 +119,6 @@ Material:
     - _Surface: 1
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 0.26274508, g: 0.25098038, b: 0.21960783, a: 0.70000005}
@@ -140,4 +139,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUSDL.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUSDL.mat
index e1e700565..e98059c58 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUSDL.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUSDL.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.36470586, g: 0.44313726, b: 0.454902, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUSDR.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUSDR.mat
index e64a452d2..5a6a2a7a0 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUSDR.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/NANUSDR.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.36470586, g: 0.44313726, b: 0.454902, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanu1flr.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanu1flr.mat
index 5a18aacc1..b788738a7 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanu1flr.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanu1flr.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.3333333, g: 0.058823504, b: 0.03529412, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanubgls.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanubgls.mat
index a054408cc..17f7a84f5 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanubgls.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanubgls.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -28,7 +28,7 @@ Material:
   - _EMISSION
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 3000
@@ -132,7 +132,6 @@ Material:
     - _Surface: 1
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 0, g: 0, b: 0.3098039, a: 0.70000005}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanublk.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanublk.mat
index 55759cd02..9aad8d110 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanublk.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanublk.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.003921569, g: 0.003921569, b: 0.003921569, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanubrg.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanubrg.mat
index 5a05f076b..96cb0ffa3 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanubrg.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanubrg.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.36470586, g: 0.44313726, b: 0.454902, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanucoop.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanucoop.mat
index c5aab3d39..a220a4259 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanucoop.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanucoop.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.2117647, g: 0.050980374, b: 0, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanudrkg.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanudrkg.mat
index 324cb23b6..d8a457b18 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanudrkg.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanudrkg.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.027450982, g: 0.027450982, b: 0.027450982, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugls.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugls.mat
index 6350eb22f..602812acc 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugls.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugls.mat	
@@ -15,7 +15,7 @@ Material:
   - _EMISSION
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 3000
@@ -119,7 +119,6 @@ Material:
     - _Surface: 1
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 0, g: 0.027450982, b: 0, a: 0.5}
@@ -140,4 +139,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugold.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugold.mat
index e66653a21..69c6e4def 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugold.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugold.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.43137255, g: 0.3098039, b: 0, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugrey.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugrey.mat
index 75ba3ab25..22a707d9c 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugrey.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugrey.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.36470586, g: 0.44313726, b: 0.454902, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugrey1.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugrey1.mat
index 3aadb1b7a..e68e1a2ac 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugrey1.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugrey1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.36470586, g: 0.44313726, b: 0.454902, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugrey2.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugrey2.mat
index 3e39a6e1c..483401b7d 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugrey2.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanugrey2.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.36470586, g: 0.44313726, b: 0.454902, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanumdmg.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanumdmg.mat
index 7bcfc5d13..df4a34b84 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanumdmg.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanumdmg.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.22745097, g: 0.22745097, b: 0.2862745, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanured.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanured.mat
index 12d78f50f..679f2c5af 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanured.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanured.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.3333333, g: 0.058823504, b: 0.03529412, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanured1.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanured1.mat
index e4527f0e6..19ee428e2 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanured1.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanured1.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -27,7 +27,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -129,7 +129,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.3333333, g: 0.058823504, b: 0.03529412, a: 1}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanured2.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanured2.mat
index 9bccedfef..120fffcaa 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanured2.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanured2.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.3333333, g: 0.058823504, b: 0.03529412, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanurlgt.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanurlgt.mat
index 2c1eff7fc..d65953e00 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanurlgt.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanurlgt.mat	
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -28,7 +28,7 @@ Material:
   - _EMISSION
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: 3000
@@ -132,7 +132,6 @@ Material:
     - _Surface: 1
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 0
     m_Colors:
     - _BaseColor: {r: 0.3098039, g: 0, b: 0, a: 0.70000005}
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanustar.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanustar.mat
index 82128ed1c..3fdd1f245 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanustar.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Ships/TorpedoBoat/Materials/nanustar.mat	
@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords:
   - _EMISSION
   m_InvalidKeywords: []
-  m_LightmapFlags: 7
+  m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
@@ -116,7 +116,6 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.5058824, g: 0.003921569, b: 0.003921569, a: 1}
@@ -137,4 +136,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Terrain/Materials/terrainTexture.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Terrain/Materials/terrainTexture.mat
index 8fce21faf..154a52752 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Terrain/Materials/terrainTexture.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/Terrain/Materials/terrainTexture.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/WindIndicator/Materials/Red.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/WindIndicator/Materials/Red.mat
index 84f178c86..202989b7a 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/WindIndicator/Materials/Red.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/WindIndicator/Materials/Red.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/WindIndicator/Materials/Silver.mat b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/WindIndicator/Materials/Silver.mat
index 808dca88a..3c45eef3a 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/WindIndicator/Materials/Silver.mat	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Models/WindIndicator/Materials/Silver.mat	
@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 10
+  version: 9
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Scenes/Main Demo/DWP2 Main Demo.unity b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Scenes/Main Demo/DWP2 Main Demo.unity
index 4947c55a8..7d4cd2b17 100644
Binary files a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Scenes/Main Demo/DWP2 Main Demo.unity and b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Base Sample/Scenes/Main Demo/DWP2 Main Demo.unity differ
diff --git a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Crest Integration/Demo/CrestIntegrationDemo.unity b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Crest Integration/Demo/CrestIntegrationDemo.unity
index 0d76c64fa..46081d33e 100644
--- a/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Crest Integration/Demo/CrestIntegrationDemo.unity	
+++ b/Assets/Samples/NWH Dynamic Water Physics 2/2.3.0/Crest Integration/Demo/CrestIntegrationDemo.unity	
@@ -455,8 +455,6 @@ MeshRenderer:
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
   m_SmallMeshCulling: 1
-  m_ForceMeshLod: -1
-  m_MeshLodSelectionBias: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -478,7 +476,6 @@ MeshRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_GlobalIlluminationMeshLod: 0
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
diff --git a/Assets/Scripts/Test/CapsuleBuoyancyStable.cs b/Assets/Scripts/Test/CapsuleBuoyancyStable.cs
index a98bffcf8..7a422e39f 100644
--- a/Assets/Scripts/Test/CapsuleBuoyancyStable.cs
+++ b/Assets/Scripts/Test/CapsuleBuoyancyStable.cs
@@ -266,15 +266,4 @@ public class CapsuleBuoyancyStable : MonoBehaviour
         a = center - half;
         b = center + half;
     }
-
-    void OnDrawGizmosSelected()
-    {
-        if (!drawDebug) return;
-
-        if (_rb == null) _rb = GetComponent<Rigidbody>();
-        Vector3 centerOfMassWorld = transform.TransformPoint(_rb != null ? _rb.centerOfMass : Vector3.zero);
-        Gizmos.color = Color.cyan;
-        Gizmos.DrawSphere(centerOfMassWorld, 0.1f);
-        Gizmos.DrawLine(centerOfMassWorld, centerOfMassWorld + Vector3.up * 0.5f);
-    }
 }
\ No newline at end of file
diff --git a/Packages/com.nwh.dynamicwaterphysics/Runtime/ShipController/Input/InputProviders/InputSystemProvider/ShipInputActions.cs b/Packages/com.nwh.dynamicwaterphysics/Runtime/ShipController/Input/InputProviders/InputSystemProvider/ShipInputActions.cs
index 879810db7..0834b84cb 100644
--- a/Packages/com.nwh.dynamicwaterphysics/Runtime/ShipController/Input/InputProviders/InputSystemProvider/ShipInputActions.cs
+++ b/Packages/com.nwh.dynamicwaterphysics/Runtime/ShipController/Input/InputProviders/InputSystemProvider/ShipInputActions.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.16.0
+//     version 1.13.0
 //     from Packages/com.nwh.dynamicwaterphysics/Runtime/ShipController/Input/InputProviders/InputSystemProvider/ShipInputActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -87,7 +87,6 @@ namespace NWH.DWP2.ShipController
         public @ShipInputActions()
         {
             asset = InputActionAsset.FromJson(@"{
-    ""version"": 1,
     ""name"": ""ShipInputActions"",
     ""maps"": [
         {