From 411da26585e358d002c2fac1be0bde086b0e91e7 Mon Sep 17 00:00:00 2001
From: NoelStephensUnity <noel.stephens@unity3d.com>
Date: Mon, 29 Jul 2024 18:05:14 -0500
Subject: [PATCH] chore

Updating the experimental public asteroids project with the most recent updates to the internal asteroids project based on the most recent fixes and updates for NGO v2.0.0-pre.3 and the MPS SDK v1.0.0-pre.1 updates.
---
 .../Assets/Materials/SessionMarkerInner.mat   |   2 +-
 .../Assets/Meshes/Materials.meta              |   2 +-
 .../Assets/Meshes/Materials/Ice.mat           |  26 +-
 .../Assets/Meshes/Materials/Ice.mat.meta      |   2 +-
 .../NetworkPrefabs/ManagementInput.prefab     |   4 +-
 ...andwidthNetStatsMonitorConfiguration.asset |  61 +-
 ...andwidthNetStatsMonitorPanelSettings.asset |  12 +-
 .../Assets/RNSM/StressTestConfiguration.asset |  33 +-
 .../Assets/Scenes/Asteroids.unity             | 154 ++---
 .../Assets/Scenes/BoostrapScene.unity         |   6 +-
 .../SmallDemos/DeferredDespawnDemo.unity      |  89 ++-
 .../DeferredDespawnDemoPrefabs.asset          |  21 +
 .../DeferredDespawnDemoPrefabs.asset.meta     |   8 +
 .../Scenes/SmallDemos/OwnershipDemo.unity     |  10 +-
 .../SmallDemos/OwnershipDemoPrefabs.asset     |  26 +
 .../OwnershipDemoPrefabs.asset.meta           |   8 +
 .../Scenes/SmallDemos/ParentingDemo.unity     |  10 +-
 .../SmallDemos/ParentingDemoPrefabs.asset     |  21 +
 .../ParentingDemoPrefabs.asset.meta           |   8 +
 .../Prefabs/DeferredDespawnAsteroid.prefab    | 104 +--
 .../SmallDemos/SceneLoading/EntryScene.unity  |  58 +-
 .../SmallDemos/SceneLoading/FirstScene.unity  |  54 --
 .../SmallDemos/SceneLoading/SecondScene.unity |  58 --
 .../SmallDemos/SceneLoading/TestScene4.unity  |  56 +-
 .../Scripts/InSceneSerializationTest.cs       | 149 ++++
 .../Scripts/InSceneSerializationTest.cs.meta  |   2 +
 .../SmallDemos/Scripts/ObjectSpawner.cs       |   4 +
 .../SmallDemos/Scripts/SceneLoadingHandler.cs | 304 +++++++++
 ...UI.cs.meta => SceneLoadingHandler.cs.meta} |   2 +-
 .../SmallDemos/Scripts/SceneLoadingUI.cs      | 203 ------
 .../SmallDemos/SerializationValidation.unity  | 643 ++++++++++++++++++
 .../SerializationValidation.unity.meta        |   7 +
 .../Assets/Scenes/SmallDemos/StressTest.unity |  10 +-
 .../SmallDemos/StressTestDemoPrefabs.asset    |  21 +
 .../StressTestDemoPrefabs.asset.meta          |   8 +
 .../Assets/Scripts/AsteroidSpawnManagement.cs |  29 +
 .../Assets/Scripts/ManagementInput.cs         |  54 +-
 .../Assets/Scripts/MinbotSpawnManagement.cs   |  30 +-
 .../Assets/Scripts/MinebotMotion.cs           |   4 +
 .../Assets/Scripts/NetworkManagerHelper.cs    | 376 ++++++----
 .../Assets/Scripts/PhysicsObjectMotion.cs     |   4 +
 .../Assets/Scripts/ShipController.cs          |  51 +-
 ...niversalRenderPipelineGlobalSettings.asset |  15 +-
 .../Packages/manifest.json                    |  12 +-
 .../ProjectSettings/ProjectVersion.txt        |   4 +-
 45 files changed, 1967 insertions(+), 798 deletions(-)
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/DeferredDespawnDemoPrefabs.asset
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/DeferredDespawnDemoPrefabs.asset.meta
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/OwnershipDemoPrefabs.asset
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/OwnershipDemoPrefabs.asset.meta
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/ParentingDemoPrefabs.asset
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/ParentingDemoPrefabs.asset.meta
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/InSceneSerializationTest.cs
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/InSceneSerializationTest.cs.meta
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingHandler.cs
 rename Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/{SceneLoadingUI.cs.meta => SceneLoadingHandler.cs.meta} (83%)
 delete mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingUI.cs
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SerializationValidation.unity
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SerializationValidation.unity.meta
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/StressTestDemoPrefabs.asset
 create mode 100644 Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/StressTestDemoPrefabs.asset.meta

diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Materials/SessionMarkerInner.mat b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Materials/SessionMarkerInner.mat
index 2ccb24494..7b309a074 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Materials/SessionMarkerInner.mat
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Materials/SessionMarkerInner.mat
@@ -26,6 +26,7 @@ Material:
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _ENVIRONMENTREFLECTIONS_OFF
+  - _NORMALMAP
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -101,7 +102,6 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _AddPrecomputedVelocity: 0
     - _AlphaClip: 0
     - _AlphaToMask: 0
     - _Blend: 3
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Meshes/Materials.meta b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Meshes/Materials.meta
index c4f105992..7bd221c55 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Meshes/Materials.meta
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Meshes/Materials.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c6cebd5e54f1047d3a9c65ab849c672e
+guid: 297ef0cfabeb24a4cb5736badd56cd03
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Meshes/Materials/Ice.mat b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Meshes/Materials/Ice.mat
index 9546a548b..a78edf073 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Meshes/Materials/Ice.mat
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Meshes/Materials/Ice.mat
@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8299206887772277349
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -120,16 +133,3 @@ Material:
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
---- !u!114 &8966067702117963788
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 9
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Meshes/Materials/Ice.mat.meta b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Meshes/Materials/Ice.mat.meta
index 7921cbaba..1e616a63d 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Meshes/Materials/Ice.mat.meta
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Meshes/Materials/Ice.mat.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6e234658d0cc848058f3845771c6b536
+guid: e690c3dcc1d93ef42af3ff72ca718256
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Prefabs/NetworkPrefabs/ManagementInput.prefab b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Prefabs/NetworkPrefabs/ManagementInput.prefab
index 186b065c8..316dcc405 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Prefabs/NetworkPrefabs/ManagementInput.prefab
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Prefabs/NetworkPrefabs/ManagementInput.prefab
@@ -46,10 +46,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 2839701726
+  GlobalObjectIdHash: 3354456092
   InScenePlacedSourceGlobalObjectIdHash: 0
   DeferredDespawnTick: 0
-  Ownership: 1
+  Ownership: 2
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
   ActiveSceneSynchronization: 0
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/RNSM/BandwidthNetStatsMonitorConfiguration.asset b/Experimental/Asteroids-CMB-NGO-Sample/Assets/RNSM/BandwidthNetStatsMonitorConfiguration.asset
index a75b04139..1e1dec76f 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/RNSM/BandwidthNetStatsMonitorConfiguration.asset
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/RNSM/BandwidthNetStatsMonitorConfiguration.asset
@@ -19,6 +19,8 @@ MonoBehaviour:
     <Stats>k__BackingField:
     - <TypeIndex>k__BackingField: 0
       <EnumValue>k__BackingField: 5
+    - <TypeIndex>k__BackingField: 0
+      <EnumValue>k__BackingField: 6
     <CounterConfiguration>k__BackingField:
       <SmoothingMethod>k__BackingField: 1
       <AggregationMethod>k__BackingField: 1
@@ -31,10 +33,9 @@ MonoBehaviour:
         m_SampleCount: 29
         <SampleRate>k__BackingField: 0
     <GraphConfiguration>k__BackingField:
-      m_SampleCount: 512
-      <SampleRate>k__BackingField: 0
-      <VariableColors>k__BackingField:
-      - {r: 0.7735849, g: 0.3816161, b: 0.08392668, a: 1}
+      m_SampleCount: 30
+      <SampleRate>k__BackingField: 1
+      <VariableColors>k__BackingField: []
       <XAxisType>k__BackingField: 0
       <LineGraphConfiguration>k__BackingField:
         m_LineThickness: 2
@@ -42,12 +43,17 @@ MonoBehaviour:
     - <TypeName>k__BackingField: Unity.Multiplayer.Tools.MetricTypes.DirectedMetricType,
         Unity.Multiplayer.Tools.MetricTypes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
       <ValueName>k__BackingField: TotalBytesReceived
+    - <TypeName>k__BackingField: Unity.Multiplayer.Tools.MetricTypes.DirectedMetricType,
+        Unity.Multiplayer.Tools.MetricTypes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+      <ValueName>k__BackingField: TotalBytesSent
   - <FieldsInitialized>k__BackingField: 1
     <Type>k__BackingField: 2
     <Label>k__BackingField: 
     <Stats>k__BackingField:
     - <TypeIndex>k__BackingField: 0
-      <EnumValue>k__BackingField: 6
+      <EnumValue>k__BackingField: 22
+    - <TypeIndex>k__BackingField: 0
+      <EnumValue>k__BackingField: 21
     <CounterConfiguration>k__BackingField:
       <SmoothingMethod>k__BackingField: 1
       <AggregationMethod>k__BackingField: 1
@@ -60,14 +66,49 @@ MonoBehaviour:
         m_SampleCount: 6
         <SampleRate>k__BackingField: 1
     <GraphConfiguration>k__BackingField:
-      m_SampleCount: 512
-      <SampleRate>k__BackingField: 0
-      <VariableColors>k__BackingField:
-      - {r: 0, g: 0.8865161, b: 1, a: 1}
+      m_SampleCount: 30
+      <SampleRate>k__BackingField: 1
+      <VariableColors>k__BackingField: []
       <XAxisType>k__BackingField: 0
       <LineGraphConfiguration>k__BackingField:
         m_LineThickness: 1
     <SerializedStats>k__BackingField:
     - <TypeName>k__BackingField: Unity.Multiplayer.Tools.MetricTypes.DirectedMetricType,
         Unity.Multiplayer.Tools.MetricTypes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
-      <ValueName>k__BackingField: TotalBytesSent
+      <ValueName>k__BackingField: NetworkVariableDeltaSent
+    - <TypeName>k__BackingField: Unity.Multiplayer.Tools.MetricTypes.DirectedMetricType,
+        Unity.Multiplayer.Tools.MetricTypes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+      <ValueName>k__BackingField: NetworkVariableDeltaReceived
+  - <FieldsInitialized>k__BackingField: 1
+    <Type>k__BackingField: 2
+    <Label>k__BackingField: 
+    <Stats>k__BackingField:
+    - <TypeIndex>k__BackingField: 0
+      <EnumValue>k__BackingField: 10
+    - <TypeIndex>k__BackingField: 0
+      <EnumValue>k__BackingField: 9
+    <CounterConfiguration>k__BackingField:
+      <SmoothingMethod>k__BackingField: 1
+      <AggregationMethod>k__BackingField: 1
+      m_SignificantDigits: 3
+      <HighlightLowerBound>k__BackingField: -3.4028235e+38
+      <HighlightUpperBound>k__BackingField: 3.402823e+38
+      <ExponentialMovingAverageParams>k__BackingField:
+        m_HalfLife: 1000000000
+      <SimpleMovingAverageParams>k__BackingField:
+        m_SampleCount: 6
+        <SampleRate>k__BackingField: 1
+    <GraphConfiguration>k__BackingField:
+      m_SampleCount: 30
+      <SampleRate>k__BackingField: 1
+      <VariableColors>k__BackingField: []
+      <XAxisType>k__BackingField: 0
+      <LineGraphConfiguration>k__BackingField:
+        m_LineThickness: 1
+    <SerializedStats>k__BackingField:
+    - <TypeName>k__BackingField: Unity.Multiplayer.Tools.MetricTypes.DirectedMetricType,
+        Unity.Multiplayer.Tools.MetricTypes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+      <ValueName>k__BackingField: RpcSent
+    - <TypeName>k__BackingField: Unity.Multiplayer.Tools.MetricTypes.DirectedMetricType,
+        Unity.Multiplayer.Tools.MetricTypes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+      <ValueName>k__BackingField: RpcReceived
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/RNSM/BandwidthNetStatsMonitorPanelSettings.asset b/Experimental/Asteroids-CMB-NGO-Sample/Assets/RNSM/BandwidthNetStatsMonitorPanelSettings.asset
index 12c70f537..d39839217 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/RNSM/BandwidthNetStatsMonitorPanelSettings.asset
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/RNSM/BandwidthNetStatsMonitorPanelSettings.asset
@@ -17,15 +17,15 @@ MonoBehaviour:
   m_TargetTexture: {fileID: 0}
   m_RenderMode: 0
   m_WorldSpaceLayer: 0
-  m_ScaleMode: 1
+  m_ScaleMode: 0
   m_ReferenceSpritePixelsPerUnit: 100
   m_PixelsPerUnit: 100
   m_Scale: 1
   m_ReferenceDpi: 72
   m_FallbackDpi: 96
-  m_ReferenceResolution: {x: 1200, y: 800}
+  m_ReferenceResolution: {x: 1024, y: 1280}
   m_ScreenMatchMode: 0
-  m_Match: 0.5
+  m_Match: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
   m_BindingLogLevel: 0
@@ -34,9 +34,9 @@ MonoBehaviour:
   m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0}
   m_VertexBudget: 0
   m_DynamicAtlasSettings:
-    m_MinAtlasSize: 96
-    m_MaxAtlasSize: 4096
-    m_MaxSubTextureSize: 64
+    m_MinAtlasSize: 128
+    m_MaxAtlasSize: 2048
+    m_MaxSubTextureSize: 128
     m_ActiveFilters: 0
   m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
   m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/RNSM/StressTestConfiguration.asset b/Experimental/Asteroids-CMB-NGO-Sample/Assets/RNSM/StressTestConfiguration.asset
index 31671f86d..9734fb420 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/RNSM/StressTestConfiguration.asset
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/RNSM/StressTestConfiguration.asset
@@ -14,11 +14,13 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   <DisplayElements>k__BackingField:
   - <FieldsInitialized>k__BackingField: 1
-    <Type>k__BackingField: 1
+    <Type>k__BackingField: 2
     <Label>k__BackingField: 
     <Stats>k__BackingField:
     - <TypeIndex>k__BackingField: 1
       <EnumValue>k__BackingField: 1
+    - <TypeIndex>k__BackingField: 1
+      <EnumValue>k__BackingField: 0
     <CounterConfiguration>k__BackingField:
       <SmoothingMethod>k__BackingField: 1
       <AggregationMethod>k__BackingField: 1
@@ -33,8 +35,7 @@ MonoBehaviour:
     <GraphConfiguration>k__BackingField:
       m_SampleCount: 512
       <SampleRate>k__BackingField: 0
-      <VariableColors>k__BackingField:
-      - {r: 0.7735849, g: 0.3816161, b: 0.08392668, a: 1}
+      <VariableColors>k__BackingField: []
       <XAxisType>k__BackingField: 0
       <LineGraphConfiguration>k__BackingField:
         m_LineThickness: 2
@@ -42,32 +43,6 @@ MonoBehaviour:
     - <TypeName>k__BackingField: GenericBall+MoverMetrics, Assembly-CSharp, Version=0.0.0.0,
         Culture=neutral, PublicKeyToken=null
       <ValueName>k__BackingField: Inbound
-  - <FieldsInitialized>k__BackingField: 1
-    <Type>k__BackingField: 1
-    <Label>k__BackingField: 
-    <Stats>k__BackingField:
-    - <TypeIndex>k__BackingField: 1
-      <EnumValue>k__BackingField: 0
-    <CounterConfiguration>k__BackingField:
-      <SmoothingMethod>k__BackingField: 1
-      <AggregationMethod>k__BackingField: 1
-      m_SignificantDigits: 3
-      <HighlightLowerBound>k__BackingField: -3.4028235e+38
-      <HighlightUpperBound>k__BackingField: 3.402823e+38
-      <ExponentialMovingAverageParams>k__BackingField:
-        m_HalfLife: 1000000000
-      <SimpleMovingAverageParams>k__BackingField:
-        m_SampleCount: 6
-        <SampleRate>k__BackingField: 1
-    <GraphConfiguration>k__BackingField:
-      m_SampleCount: 512
-      <SampleRate>k__BackingField: 0
-      <VariableColors>k__BackingField:
-      - {r: 0, g: 0.8865161, b: 1, a: 1}
-      <XAxisType>k__BackingField: 0
-      <LineGraphConfiguration>k__BackingField:
-        m_LineThickness: 1
-    <SerializedStats>k__BackingField:
     - <TypeName>k__BackingField: GenericBall+MoverMetrics, Assembly-CSharp, Version=0.0.0.0,
         Culture=neutral, PublicKeyToken=null
       <ValueName>k__BackingField: Outbound
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/Asteroids.unity b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/Asteroids.unity
index 118d9ca98..d462b5fcd 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/Asteroids.unity
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/Asteroids.unity
@@ -481,7 +481,7 @@ MonoBehaviour:
     NetworkTopology: 1
     UseCMBService: 0
     AutoSpawnPlayerPrefabClientSide: 1
-    NetworkMessageMetrics: 0
+    NetworkMessageMetrics: 1
     NetworkProfilingMetrics: 0
     OldPrefabList: []
   RunInBackground: 1
@@ -768,6 +768,75 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 559627235}
   m_CullTransparentMesh: 1
+--- !u!1001 &644359985
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 8319406705434007251, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: m_Name
+      value: ManagementInput
+      objectReference: {fileID: 0}
+    - target: {fileID: 8514170823894078974, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 3973153686
+      objectReference: {fileID: 0}
+    - target: {fileID: 8514170823894078974, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: DontDestroyWithOwner
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8514170823894078974, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 2839701726
+      objectReference: {fileID: 0}
+    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
 --- !u!1001 &655704437
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1282,7 +1351,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2609333811806524831, guid: 06943cba0d6877f4db223733c78b7368, type: 3}
       propertyPath: Ownership
-      value: 0
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 2609333811806524831, guid: 06943cba0d6877f4db223733c78b7368, type: 3}
       propertyPath: GlobalObjectIdHash
@@ -1355,7 +1424,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 2609333811806524831, guid: a3c1ef6a5fde1744ba65fcbdfcbbb05c, type: 3}
       propertyPath: Ownership
-      value: 0
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 2609333811806524831, guid: a3c1ef6a5fde1744ba65fcbdfcbbb05c, type: 3}
       propertyPath: GlobalObjectIdHash
@@ -2273,83 +2342,6 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 190bdc14a099eca4e83d729c70bdd5c9, type: 3}
---- !u!1001 &1850772811
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 8319406705434007251, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: m_Name
-      value: ManagementInput
-      objectReference: {fileID: 0}
-    - target: {fileID: 8319406705434007251, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8514170823894078974, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: Ownership
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8514170823894078974, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: GlobalObjectIdHash
-      value: 3313492652
-      objectReference: {fileID: 0}
-    - target: {fileID: 8514170823894078974, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: DontDestroyWithOwner
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8514170823894078974, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: InScenePlacedSourceGlobalObjectIdHash
-      value: 2839701726
-      objectReference: {fileID: 0}
-    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9217462070934506968, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
 --- !u!1001 &1918166479
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2597,6 +2589,6 @@ SceneRoots:
   - {fileID: 82358326}
   - {fileID: 864046601}
   - {fileID: 855792801}
-  - {fileID: 1850772811}
   - {fileID: 864442726}
   - {fileID: 918394571}
+  - {fileID: 644359985}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/BoostrapScene.unity b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/BoostrapScene.unity
index 41a85a152..3bd60e9ce 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/BoostrapScene.unity
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/BoostrapScene.unity
@@ -161,8 +161,10 @@ MonoBehaviour:
     DisplayName: Deferred Despawn
   - SceneToLoad: EntryScene
     DisplayName: Scene Loading
-  - SceneToLoad: SimpleSpawn
+  - SceneToLoad: StressTest
     DisplayName: Stress Test
+  - SceneToLoad: SerializationValidation
+    DisplayName: Serialization
   SceneEntries:
   - SceneAsset: {fileID: 102900000, guid: c9577fbf33d534bfaaf03cc17f53db25, type: 3}
     DisplayName: Asteroids
@@ -176,6 +178,8 @@ MonoBehaviour:
     DisplayName: Scene Loading
   - SceneAsset: {fileID: 102900000, guid: 251cb0a5971ca4f4fba9ac6659e12f39, type: 3}
     DisplayName: Stress Test
+  - SceneAsset: {fileID: 102900000, guid: 47bc26a5afcc3504599ae86448de01fc, type: 3}
+    DisplayName: Serialization
 --- !u!114 &880304801
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/DeferredDespawnDemo.unity b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/DeferredDespawnDemo.unity
index 84c719af2..bc0d3b512 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/DeferredDespawnDemo.unity
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/DeferredDespawnDemo.unity
@@ -126,6 +126,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 2210862102861094165, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+      propertyPath: m_Visible
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8319406705434007251, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
       propertyPath: m_Name
       value: ManagementInput
@@ -653,7 +657,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e4d8d44c602b97b47ba488a40c66267c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  NetStatsMonitor: {fileID: 0}
+  NetStatsMonitor: {fileID: 1556753231}
   ResolutionFactor: 0.4
   ConsoleLogVisible: 0
   CanStartGame: 1
@@ -693,7 +697,7 @@ MonoBehaviour:
     PlayerPrefab: {fileID: 0}
     Prefabs:
       NetworkPrefabsLists:
-      - {fileID: 11400000, guid: 906f0507f954437468a8a82210a167dc, type: 2}
+      - {fileID: 11400000, guid: 776458d6995f95945aab051d6972fdf8, type: 2}
     TickRate: 30
     ClientConnectionBufferTimeout: 10
     ConnectionApproval: 0
@@ -713,7 +717,7 @@ MonoBehaviour:
     UseCMBService: 1
     AutoSpawnPlayerPrefabClientSide: 1
     NetworkMessageMetrics: 1
-    NetworkProfilingMetrics: 1
+    NetworkProfilingMetrics: 0
     OldPrefabList: []
   RunInBackground: 1
   LogLevel: 1
@@ -746,6 +750,71 @@ MonoBehaviour:
     PacketDelayMS: 0
     PacketJitterMS: 0
     PacketDropRate: 0
+--- !u!1001 &459792091
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2665105754558924010, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2665105754558924010, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2665105754558924010, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2665105754558924010, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2665105754558924010, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2665105754558924010, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2665105754558924010, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2665105754558924010, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2665105754558924010, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2665105754558924010, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2831287357212287415, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 3553044834
+      objectReference: {fileID: 0}
+    - target: {fileID: 2831287357212287415, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 373223726
+      objectReference: {fileID: 0}
+    - target: {fileID: 3119965064492705097, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
+      propertyPath: m_Name
+      value: DeferredDespawnAsteroid
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 48789f8e04fdf5f449360ce764062f1a, type: 3}
 --- !u!1 &479361661
 GameObject:
   m_ObjectHideFlags: 0
@@ -1193,7 +1262,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &700966313
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2246,6 +2315,17 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1546018417}
   m_CullTransparentMesh: 1
+--- !u!114 &1556753231 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2210862102861094165, guid: 1b835a0e89724df4bae63ce6b267da1a, type: 3}
+  m_PrefabInstance: {fileID: 57774110}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17737e0516da2445b9b0077ae2bd9b4f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1561330656
 GameObject:
   m_ObjectHideFlags: 0
@@ -2783,6 +2863,7 @@ SceneRoots:
   - {fileID: 1184702128}
   - {fileID: 1830910793}
   - {fileID: 840982904}
+  - {fileID: 459792091}
   - {fileID: 700966315}
   - {fileID: 1644089087}
   - {fileID: 864442726}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/DeferredDespawnDemoPrefabs.asset b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/DeferredDespawnDemoPrefabs.asset
new file mode 100644
index 000000000..f431c329f
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/DeferredDespawnDemoPrefabs.asset
@@ -0,0 +1,21 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e651dbb3fbac04af2b8f5abf007ddc23, type: 3}
+  m_Name: DeferredDespawnDemoPrefabs
+  m_EditorClassIdentifier: 
+  IsDefault: 0
+  List:
+  - Override: 0
+    Prefab: {fileID: 8913476639236117869, guid: c6a868c62eb6a3f49af798b9c1fcdc58, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/DeferredDespawnDemoPrefabs.asset.meta b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/DeferredDespawnDemoPrefabs.asset.meta
new file mode 100644
index 000000000..fff6c6f39
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/DeferredDespawnDemoPrefabs.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 776458d6995f95945aab051d6972fdf8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/OwnershipDemo.unity b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/OwnershipDemo.unity
index af69f0243..854732a54 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/OwnershipDemo.unity
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/OwnershipDemo.unity
@@ -233,7 +233,7 @@ MonoBehaviour:
     PlayerPrefab: {fileID: 9188757746490394803, guid: 1955dfd5a65fbbb4da2e0aeb2c326f84, type: 3}
     Prefabs:
       NetworkPrefabsLists:
-      - {fileID: 11400000, guid: 3e3ce682a26375d40a565c5dedca3d05, type: 2}
+      - {fileID: 11400000, guid: 9a35cee89c41db44184bbc3a804f5bc5, type: 2}
     TickRate: 30
     ClientConnectionBufferTimeout: 10
     ConnectionApproval: 0
@@ -253,7 +253,7 @@ MonoBehaviour:
     UseCMBService: 1
     AutoSpawnPlayerPrefabClientSide: 1
     NetworkMessageMetrics: 1
-    NetworkProfilingMetrics: 1
+    NetworkProfilingMetrics: 0
     OldPrefabList: []
   RunInBackground: 1
   LogLevel: 0
@@ -814,6 +814,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 4454842426221127108, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_Visible
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4454842426221127108, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
       propertyPath: <Configuration>k__BackingField
       value: 
@@ -828,7 +832,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4454842426221127109, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
       propertyPath: m_LocalScale.x
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/OwnershipDemoPrefabs.asset b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/OwnershipDemoPrefabs.asset
new file mode 100644
index 000000000..62509efbe
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/OwnershipDemoPrefabs.asset
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e651dbb3fbac04af2b8f5abf007ddc23, type: 3}
+  m_Name: OwnershipDemoPrefabs
+  m_EditorClassIdentifier: 
+  IsDefault: 0
+  List:
+  - Override: 0
+    Prefab: {fileID: 9188757746490394803, guid: 035dfb63fa2988b40bb4416f7fa48b8e, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 697164337210508255, guid: f683f793967fe584ab6052d1853f875b, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/OwnershipDemoPrefabs.asset.meta b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/OwnershipDemoPrefabs.asset.meta
new file mode 100644
index 000000000..300fe5db2
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/OwnershipDemoPrefabs.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9a35cee89c41db44184bbc3a804f5bc5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/ParentingDemo.unity b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/ParentingDemo.unity
index 445ffdc2f..40ec932a4 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/ParentingDemo.unity
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/ParentingDemo.unity
@@ -126,6 +126,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 4454842426221127108, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_Visible
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4454842426221127108, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
       propertyPath: <Configuration>k__BackingField
       value: 
@@ -140,7 +144,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4454842426221127109, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
       propertyPath: m_LocalScale.x
@@ -325,7 +329,7 @@ MonoBehaviour:
     PlayerPrefab: {fileID: 9188757746490394803, guid: 1955dfd5a65fbbb4da2e0aeb2c326f84, type: 3}
     Prefabs:
       NetworkPrefabsLists:
-      - {fileID: 11400000, guid: 3e3ce682a26375d40a565c5dedca3d05, type: 2}
+      - {fileID: 11400000, guid: 4951d0334ad124d4da99cdce18bba7f6, type: 2}
     TickRate: 30
     ClientConnectionBufferTimeout: 10
     ConnectionApproval: 0
@@ -344,7 +348,7 @@ MonoBehaviour:
     NetworkTopology: 1
     UseCMBService: 1
     AutoSpawnPlayerPrefabClientSide: 1
-    NetworkMessageMetrics: 0
+    NetworkMessageMetrics: 1
     NetworkProfilingMetrics: 0
     OldPrefabList: []
   RunInBackground: 1
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/ParentingDemoPrefabs.asset b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/ParentingDemoPrefabs.asset
new file mode 100644
index 000000000..cd9b5a5f1
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/ParentingDemoPrefabs.asset
@@ -0,0 +1,21 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e651dbb3fbac04af2b8f5abf007ddc23, type: 3}
+  m_Name: ParentingDemoPrefabs
+  m_EditorClassIdentifier: 
+  IsDefault: 0
+  List:
+  - Override: 0
+    Prefab: {fileID: 9188757746490394803, guid: d7f4754a7ac493643b9ef8e7895181b4, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/ParentingDemoPrefabs.asset.meta b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/ParentingDemoPrefabs.asset.meta
new file mode 100644
index 000000000..b8e5183a0
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/ParentingDemoPrefabs.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4951d0334ad124d4da99cdce18bba7f6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Prefabs/DeferredDespawnAsteroid.prefab b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Prefabs/DeferredDespawnAsteroid.prefab
index fd57e7201..ca5d81a8e 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Prefabs/DeferredDespawnAsteroid.prefab
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Prefabs/DeferredDespawnAsteroid.prefab
@@ -89,7 +89,6 @@ Transform:
   m_LocalScale: {x: 3, y: 3, z: 3}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2514764541213838367}
   - {fileID: 7304872490676950099}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -185,7 +184,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 373223726
+  GlobalObjectIdHash: 2157307136
   InScenePlacedSourceGlobalObjectIdHash: 0
   DeferredDespawnTick: 0
   Ownership: 2
@@ -281,104 +280,3 @@ MonoBehaviour:
   LaserOffset: -3
   LaserVelocity: 8
   ScrollDeltaMult: 2
---- !u!1 &5018897855437251152
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2514764541213838367}
-  - component: {fileID: 3761138051318171605}
-  - component: {fileID: 5736265817404182214}
-  - component: {fileID: 5402489014776213831}
-  m_Layer: 0
-  m_Name: OwnerSphere
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &2514764541213838367
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5018897855437251152}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 8, y: 8, z: 8}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2665105754558924010}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &3761138051318171605
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5018897855437251152}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &5736265817404182214
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5018897855437251152}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 854ce1ed9f350ef47bd3c736c658c751, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!114 &5402489014776213831
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5018897855437251152}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d18d8cfb83f3b964db1ff23184a446be, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  ApplyColorToChildren: 0
-  AlwaysVisualize: 0
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/EntryScene.unity b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/EntryScene.unity
index 074902cac..b211862eb 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/EntryScene.unity
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/EntryScene.unity
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 10
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -38,13 +38,11 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 12
-  m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -67,9 +65,6 @@ LightmapSettings:
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
     m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
     m_ReflectionCompression: 2
     m_MixedBakeMode: 2
     m_BakeBackend: 1
@@ -136,6 +131,7 @@ GameObject:
   - component: {fileID: 217166183}
   - component: {fileID: 217166182}
   - component: {fileID: 217166185}
+  - component: {fileID: 217166186}
   m_Layer: 0
   m_Name: NetworkManager
   m_TagString: Untagged
@@ -171,6 +167,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e4d8d44c602b97b47ba488a40c66267c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  NetStatsMonitor: {fileID: 0}
   ResolutionFactor: 0.4
   ConsoleLogVisible: 1
   CanStartGame: 1
@@ -255,9 +252,11 @@ MonoBehaviour:
     LoadSceneTimeOut: 120
     SpawnTimeout: 5
     EnableNetworkLogs: 1
-    SessionMode: 1
+    NetworkTopology: 1
     UseCMBService: 1
     AutoSpawnPlayerPrefabClientSide: 1
+    NetworkMessageMetrics: 1
+    NetworkProfilingMetrics: 0
     OldPrefabList: []
   RunInBackground: 1
   LogLevel: 1
@@ -273,6 +272,39 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1652e59dd457e124c8587253649fd4bb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &217166186
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 217166180}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd25a428f585ce4d96373fcebe859e1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SceneGroups:
+  - ActiveScene: FirstScene
+    AdditiveScenes:
+    - TestScene1
+    - TestScene2
+    ActiveSceneToLoad: {fileID: 102900000, guid: 8d79a902790e034499ee3f928658c1e6, type: 3}
+    ScenesToLoad:
+    - {fileID: 102900000, guid: e038f8eba64670b4d87ec415baf622d6, type: 3}
+    - {fileID: 102900000, guid: 6c3b918d04e3fc742995e2872a0951ca, type: 3}
+  - ActiveScene: SecondScene
+    AdditiveScenes:
+    - TestScene1
+    - TestScene2
+    - TestScene3
+    - TestScene4
+    ActiveSceneToLoad: {fileID: 102900000, guid: 44c38a04bf0dfd547aafac271c9ec08c, type: 3}
+    ScenesToLoad:
+    - {fileID: 102900000, guid: e038f8eba64670b4d87ec415baf622d6, type: 3}
+    - {fileID: 102900000, guid: 6c3b918d04e3fc742995e2872a0951ca, type: 3}
+    - {fileID: 102900000, guid: 077673329467c7643aba667321bb2ce9, type: 3}
+    - {fileID: 102900000, guid: 6475e4279892686499f2ad43a1c2908e, type: 3}
 --- !u!1 &578514976
 GameObject:
   m_ObjectHideFlags: 0
@@ -376,12 +408,12 @@ MonoBehaviour:
   m_RequiresColorTexture: 0
   m_Version: 2
   m_TaaSettings:
-    quality: 3
-    frameInfluence: 0.1
-    jitterScale: 1
-    mipBias: 0
-    varianceClampScale: 0.9
-    contrastAdaptiveSharpening: 0
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
 --- !u!81 &1301703132
 AudioListener:
   m_ObjectHideFlags: 0
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/FirstScene.unity b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/FirstScene.unity
index 1c431cacf..57efb0a88 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/FirstScene.unity
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/FirstScene.unity
@@ -38,7 +38,6 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -410,58 +409,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!1 &1002758050
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1002758052}
-  - component: {fileID: 1002758051}
-  m_Layer: 0
-  m_Name: SessionOwnerGUI
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1002758051
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1002758050}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a67a779c7672cba4a998595b5f58a224, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_SceneNames:
-  - TestScene1
-  - TestScene2
-  m_TransitionToScene: SecondScene
-  TransistionToScene: {fileID: 102900000, guid: 44c38a04bf0dfd547aafac271c9ec08c, type: 3}
-  ScenesToLoad:
-  - {fileID: 102900000, guid: e038f8eba64670b4d87ec415baf622d6, type: 3}
-  - {fileID: 102900000, guid: 6c3b918d04e3fc742995e2872a0951ca, type: 3}
---- !u!4 &1002758052
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1002758050}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1012499125
 GameObject:
   m_ObjectHideFlags: 0
@@ -861,5 +808,4 @@ SceneRoots:
   - {fileID: 1033614449}
   - {fileID: 727654115}
   - {fileID: 1472673714}
-  - {fileID: 1002758052}
   - {fileID: 246489353}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/SecondScene.unity b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/SecondScene.unity
index 89357487d..52fb931e1 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/SecondScene.unity
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/SecondScene.unity
@@ -38,7 +38,6 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -410,62 +409,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!1 &1002758050
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1002758052}
-  - component: {fileID: 1002758051}
-  m_Layer: 0
-  m_Name: SessionOwnerGUI
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1002758051
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1002758050}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a67a779c7672cba4a998595b5f58a224, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_SceneNames:
-  - TestScene1
-  - TestScene2
-  - TestScene3
-  - TestScene4
-  m_TransitionToScene: FirstScene
-  TransistionToScene: {fileID: 102900000, guid: 8d79a902790e034499ee3f928658c1e6, type: 3}
-  ScenesToLoad:
-  - {fileID: 102900000, guid: e038f8eba64670b4d87ec415baf622d6, type: 3}
-  - {fileID: 102900000, guid: 6c3b918d04e3fc742995e2872a0951ca, type: 3}
-  - {fileID: 102900000, guid: 077673329467c7643aba667321bb2ce9, type: 3}
-  - {fileID: 102900000, guid: 6475e4279892686499f2ad43a1c2908e, type: 3}
---- !u!4 &1002758052
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1002758050}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1033614445
 GameObject:
   m_ObjectHideFlags: 0
@@ -865,5 +808,4 @@ SceneRoots:
   - {fileID: 1033614449}
   - {fileID: 727654115}
   - {fileID: 1472673714}
-  - {fileID: 1002758052}
   - {fileID: 246489353}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/TestScene4.unity b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/TestScene4.unity
index 7300267c4..7ee6d3d17 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/TestScene4.unity
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SceneLoading/TestScene4.unity
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 10
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -38,13 +38,11 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 12
-  m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -67,9 +65,6 @@ LightmapSettings:
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
     m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
     m_ReflectionCompression: 2
     m_MixedBakeMode: 2
     m_BakeBackend: 1
@@ -134,7 +129,7 @@ GameObject:
   - component: {fileID: 1675776122}
   - component: {fileID: 1675776121}
   - component: {fileID: 1675776120}
-  - component: {fileID: 1675776119}
+  - component: {fileID: 1675776123}
   m_Layer: 0
   m_Name: Cylinder
   m_TagString: Untagged
@@ -142,27 +137,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!135 &1675776119
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1675776118}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &1675776120
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -180,6 +154,9 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -228,6 +205,29 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &1675776123
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1675776118}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5000001
+  m_Height: 2
+  m_Direction: 1
+  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/InSceneSerializationTest.cs b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/InSceneSerializationTest.cs
new file mode 100644
index 000000000..0a58e870a
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/InSceneSerializationTest.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Text;
+using Unity.Netcode;
+using Random = UnityEngine.Random;
+
+public class InSceneSerializationTest : NetworkBehaviour
+{
+    private struct SerializableTypesData : INetworkSerializable, IEquatable<SerializableTypesData>
+    {
+        public bool SomeBool;
+        public byte SomeByte;
+        public char SomeChar;
+        public short SomeShort;
+        public ushort SomeUShort;
+        public int SomeInt;
+        public uint SomeUInt;
+        public long SomeLong;
+        public ulong SomeULong;
+        public float SomeFloat;
+        public double SomeDouble;
+        public string SomeString;
+        private byte[] StringData;
+
+         public void PopulateSerializableTypes()
+        {
+            SomeBool = Random.Range(0, 1) == 1;
+            SomeByte = (byte)Random.Range(byte.MinValue, byte.MaxValue);
+            SomeChar = (char)Random.Range(byte.MinValue, byte.MaxValue);
+            SomeShort = (short)Random.Range(short.MinValue, short.MaxValue);
+            SomeUShort = (ushort)Random.Range(ushort.MinValue, ushort.MaxValue);
+            SomeInt = Random.Range(int.MinValue, int.MaxValue);
+            SomeUInt = (uint)Random.Range(uint.MinValue, uint.MaxValue);
+            SomeLong = Random.Range(int.MinValue, int.MaxValue);
+            SomeULong = (ulong)Random.Range(uint.MinValue, uint.MaxValue);
+            SomeFloat = Random.Range(uint.MinValue, uint.MaxValue);
+            SomeDouble = Random.Range(uint.MinValue, uint.MaxValue);
+            SomeString = NetworkManagerHelper.GetRandomString(Random.Range(0, 128));
+        }
+
+        private void SerializeString<T>(BufferSerializer<T> serializer) where T : IReaderWriter
+        {
+            var stringDataSize = 0;
+            if (serializer.IsWriter)
+            {
+                if (!string.IsNullOrEmpty(SomeString))
+                {
+                    StringData = Encoding.UTF8.GetBytes(SomeString);
+                    stringDataSize = StringData.Length;
+                }
+                serializer.SerializeValue(ref stringDataSize);
+                if (stringDataSize > 0)
+                {
+                    serializer.SerializeValue(ref StringData);
+                }
+            }
+            else
+            {
+                serializer.SerializeValue(ref stringDataSize);
+                if (stringDataSize > 0)
+                {
+                    StringData = new byte[stringDataSize];
+                    serializer.SerializeValue(ref StringData);
+                    SomeString = Encoding.UTF8.GetString(StringData);
+                }
+                else
+                {
+                    SomeString = string.Empty;
+                }
+            }
+        }
+
+        public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
+        {
+            serializer.SerializeValue(ref SomeBool);
+            serializer.SerializeValue(ref SomeByte);
+            serializer.SerializeValue(ref SomeChar);
+            serializer.SerializeValue(ref SomeShort);
+            serializer.SerializeValue(ref SomeUShort);
+            serializer.SerializeValue(ref SomeInt);
+            serializer.SerializeValue(ref SomeUInt);
+            serializer.SerializeValue(ref SomeLong);
+            serializer.SerializeValue(ref SomeULong);
+            serializer.SerializeValue(ref SomeFloat);
+            serializer.SerializeValue(ref SomeDouble);
+            SerializeString(serializer);
+        }
+
+        public bool Equals(SerializableTypesData other)
+        {
+            var success = other.SomeBool.Equals(SomeBool);
+            success = success && other.SomeByte.Equals(SomeByte);
+            success = success && other.SomeChar.Equals(SomeChar);
+            success = success && other.SomeShort.Equals(SomeShort);
+            success = success && other.SomeUShort.Equals(SomeUShort);
+            success = success && other.SomeInt.Equals(SomeInt);
+            success = success && other.SomeUInt.Equals(SomeUInt);
+            success = success && other.SomeLong.Equals(SomeLong);
+            success = success && other.SomeULong.Equals(SomeULong);
+            success = success && other.SomeFloat.Equals(SomeFloat);
+            success = success && other.SomeDouble.Equals(SomeDouble);
+            // Check and handle null or empty string
+            if (!string.IsNullOrEmpty(SomeString))
+            {
+                success = success && other.SomeString.Equals(SomeString);
+            }
+            else
+            {
+                success = success && string.IsNullOrEmpty(other.SomeString);
+            }
+            return success;
+        }
+    }
+
+    private NetworkVariable<SerializableTypesData> m_SerializableTypesData = new();
+
+    public override void OnNetworkSpawn()
+    {
+        if (IsSessionOwner)
+        {
+            var newData = new SerializableTypesData();
+            newData.PopulateSerializableTypes();
+            m_SerializableTypesData.Value = newData;
+        }
+        base.OnNetworkSpawn();
+    }
+
+    protected override void OnNetworkPostSpawn()
+    {
+        if (!IsSessionOwner)
+        {
+            ValidateDataRpc(m_SerializableTypesData.Value);
+        }
+        base.OnNetworkPostSpawn();
+    }
+
+    [Rpc(SendTo.Authority)]
+    private void ValidateDataRpc(SerializableTypesData data, RpcParams rpcParams = default)
+    {
+        var senderId = rpcParams.Receive.SenderClientId;
+        if (!data.Equals(m_SerializableTypesData.Value))
+        {
+            NetworkManagerHelper.Instance.LogMessage($"[Client-{senderId}][Validate - {nameof(SerializableTypesData)}][Failed]");
+        }
+        else
+        {
+            NetworkManagerHelper.Instance.LogMessage($"[Client-{senderId}][Validate - {nameof(SerializableTypesData)}][Success]");
+        }
+    }
+}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/InSceneSerializationTest.cs.meta b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/InSceneSerializationTest.cs.meta
new file mode 100644
index 000000000..528cbb4b6
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/InSceneSerializationTest.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 41a6f321a7bcd1e49b41ebeedb31ea1e
\ No newline at end of file
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/ObjectSpawner.cs b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/ObjectSpawner.cs
index 800a111df..b32654d3a 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/ObjectSpawner.cs
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/ObjectSpawner.cs
@@ -158,6 +158,10 @@ private void Update()
 
     private void UpdateInput()
     {
+        if (!Input.GetMouseButtonDown(0))
+        {
+            return;
+        }
         var selection = MouseSelectObject.SelectObject<MoverScript>();
         if (selection == null)
         {
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingHandler.cs b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingHandler.cs
new file mode 100644
index 000000000..5a490f9e2
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingHandler.cs
@@ -0,0 +1,304 @@
+using System;
+using System.Collections.Generic;
+using Unity.Netcode;
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+
+public class SceneLoadingHandler : MonoBehaviour
+{
+    public List<SceneGroup> SceneGroups;
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        foreach (var sceneGroup in SceneGroups)
+        {
+            sceneGroup.OnValidateProcess();
+        }
+    }
+#endif
+
+    private Dictionary<string, Scene> m_ScenesLoaded = new Dictionary<string, Scene>();
+    private NetworkManager m_NetworkManager;
+    private NetworkManagerHelper m_NetworkManagerHelper;
+    private int m_CurrentSceneGroup;
+
+    private void Awake()
+    {
+        m_NetworkManager = GetComponent<NetworkManager>();
+        m_NetworkManagerHelper = GetComponent<NetworkManagerHelper>();
+    }
+
+    private void Start()
+    {
+        // OnShuttingDown is invoked just prior to NetworkManager.Shutdown being invoked (i.e. when you hit the "X" button in top left corner)
+        m_NetworkManagerHelper.OnShuttingDown += OnShuttingDownNetworkManager;
+        // Register for when the client is started
+        m_NetworkManager.OnClientStarted += OnClientStarted;
+        m_NetworkManager.OnClientConnectedCallback += OnClientConnectedCallback;
+
+        
+    }
+
+    private void OnClientConnectedCallback(ulong clientId)
+    {
+        if (clientId == m_NetworkManager.LocalClientId)
+        {
+            SetSceneGroupIndex();
+            UpdateSynchronizedScenes();
+        }
+    }
+
+    /// <summary>
+    /// Handles clean up just prior to shutting down the NetworkManager
+    /// </summary>
+    private void OnShuttingDownNetworkManager()
+    {
+        SceneManager.activeSceneChanged -= ActiveSceneChanged;
+        m_NetworkManager.SceneManager.OnSynchronizeComplete -= OnSynchronizeComplete;
+        m_NetworkManager.SceneManager.OnSceneEvent -= OnSceneEvent;
+        m_NetworkManager.OnClientStopped += OnClientStopped;
+    }
+
+    private void OnClientStopped(bool obj)
+    {
+        m_NetworkManager.OnClientStopped -= OnClientStopped;
+        var sceneGroup = GetSceneGroup(0);
+        if (sceneGroup != null) 
+        {
+            var activeScene = SceneManager.GetActiveScene();
+            if (activeScene.name != sceneGroup.ActiveScene)
+            {
+                Camera.main.transform.SetParent(m_NetworkManager.transform, false);
+                m_CurrentSceneGroup = 0;
+                SceneManager.LoadScene(sceneGroup.ActiveScene, LoadSceneMode.Single);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Checks for a change in the current scene group
+    /// </summary>
+    private void ActiveSceneChanged(Scene arg0, Scene arg1)
+    {
+        // When the active scene changes, we check to see if we transitioned 
+        // to a new scene group
+        SetSceneGroupIndex();
+    }
+
+    /// <summary>
+    /// When the client is started we subscribe to the NetworkSceneManager events and configure
+    /// the client synchronization mode settings.
+    /// </summary>
+    private void OnClientStarted()
+    {
+        SceneManager.activeSceneChanged += ActiveSceneChanged;
+        m_NetworkManager.SceneManager.OnSynchronizeComplete += OnSynchronizeComplete;
+        m_NetworkManager.SceneManager.OnSceneEvent += OnSceneEvent;
+        m_NetworkManager.SceneManager.SetClientSynchronizationMode(LoadSceneMode.Additive);
+        m_NetworkManager.SceneManager.PostSynchronizationSceneUnloading = true;
+    }
+
+    /// <summary>
+    /// Once a client is fully synchronized, we want to know when it will be stopped and
+    /// we can unsubscribe to the SynchronizeComplete event.
+    /// </summary>
+    /// <param name="clientId"></param>
+    private void OnSynchronizeComplete(ulong clientId)
+    {
+        // In distributed authority, you need to check if the notification is for the local client before
+        // applying any relted notification relative logic since notifications are broadcasted
+        if (m_NetworkManager.LocalClientId == clientId)
+        {
+            UpdateSynchronizedScenes();
+        }
+    }
+
+    /// <summary>
+    /// Handles resynchronizing our local scenes loaded list for the session owner UI overlay
+    /// </summary>
+    private void UpdateSynchronizedScenes()
+    {
+        var scenesLoaded = m_NetworkManager.SceneManager.GetSynchronizedScenes();
+        m_ScenesLoaded.Clear();
+        foreach (var scene in scenesLoaded)
+        {
+            if (!m_ScenesLoaded.ContainsKey(scene.name))
+            {
+                m_ScenesLoaded.Add(scene.name, scene);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Gets the scene group based on the index passed in. It will roll over 
+    /// if the index is beyond the maximum number of entries
+    /// </summary>
+    private SceneGroup GetSceneGroup(int sceneGroupIndex)
+    {
+        return SceneGroups[sceneGroupIndex % SceneGroups.Count];
+    }
+
+    /// <summary>
+    /// Sets the current scene group index
+    /// </summary>
+    private void SetSceneGroupIndex()
+    {
+        var activeScene = SceneManager.GetActiveScene();
+        for(int i = 0; i < SceneGroups.Count; i++)
+        {
+            var sceneGroup = SceneGroups[i];
+            if (sceneGroup.ActiveScene == activeScene.name)
+            {
+                if (m_CurrentSceneGroup != i)
+                {
+                    UpdateSynchronizedScenes();
+                }
+                m_CurrentSceneGroup = i;
+                break;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Notification handler for in-session scene events
+    /// </summary>
+    /// <param name="sceneEvent"></param>
+    private void OnSceneEvent(SceneEvent sceneEvent)
+    {
+#if UNITY_EDITOR
+        var sceneName = string.Empty;
+        if (sceneEvent.SceneEventType != SceneEventType.Synchronize && sceneEvent.SceneEventType != SceneEventType.SynchronizeComplete)
+        {
+            sceneName = sceneEvent.SceneName;
+        }
+        Debug.Log($"[{name}][{sceneEvent.SceneEventType}][Target Client-{sceneEvent.ClientId}][{sceneName}]");
+#endif
+        switch (sceneEvent.SceneEventType)
+        {
+            case SceneEventType.LoadComplete:
+                {
+                    // If this LoadComplete event is for the local client, then add the newly loaded scene
+                    // to the m_ScenesLoaded.
+                    if (sceneEvent.ClientId == m_NetworkManager.LocalClientId)
+                    {
+                        if (!m_ScenesLoaded.ContainsKey(sceneEvent.SceneName))
+                        {
+                            m_ScenesLoaded.Add(sceneEvent.SceneName, sceneEvent.Scene);
+                        }
+                    }
+                    break;
+                }
+            case SceneEventType.UnloadComplete:
+                {
+                    // If this LoadComplete event is for the local client, then remove the unloaded scene
+                    // from the m_ScenesLoaded.
+                    if (sceneEvent.ClientId == m_NetworkManager.LocalClientId)
+                    {
+                        if (m_ScenesLoaded.ContainsKey(sceneEvent.SceneName))
+                        {
+                            m_ScenesLoaded.Remove(sceneEvent.SceneName);
+                        }
+                    }
+                    break;
+                }
+        }
+    }
+
+    /// <summary>
+    /// Draws the session owner UI overlay
+    /// </summary>
+    private void OnGUI()
+    {
+        if (!m_NetworkManager || !m_NetworkManager.IsConnectedClient) return;
+
+        GUILayout.BeginArea(new Rect(Screen.width - 200, 50, 190, 400));
+        var sessionOwner = m_NetworkManager.LocalClient.IsSessionOwner;
+        var currentSceneGroup = GetSceneGroup(m_CurrentSceneGroup);
+
+        if (sessionOwner)
+        {
+            var nextSceneGroup = GetSceneGroup(m_CurrentSceneGroup + 1);
+            if (GUILayout.Button($"[SingleMode] {nextSceneGroup.ActiveScene}"))
+            {
+                var status = m_NetworkManager.SceneManager.LoadScene(nextSceneGroup.ActiveScene, LoadSceneMode.Single);
+                if (status != SceneEventProgressStatus.Started)
+                {
+                    m_NetworkManagerHelper.LogMessage($"Failed to load scene {nextSceneGroup.ActiveScene} due to: {status}");
+                }
+            }
+        }
+
+        foreach (var sceneName in currentSceneGroup.AdditiveScenes)
+        {
+            if (m_ScenesLoaded.ContainsKey(sceneName))
+            {
+                if (sessionOwner)
+                {
+                    if (GUILayout.Button($"[Unload] {sceneName}"))
+                    {
+                        m_NetworkManager.SceneManager.UnloadScene(m_ScenesLoaded[sceneName]);
+                    }
+                }
+
+                if (m_NetworkManager.LocalClient.PlayerObject.gameObject.scene.name != sceneName)
+                {
+                    if (GUILayout.Button($"[Player Migrate] {sceneName}"))
+                    {
+                        SceneManager.MoveGameObjectToScene(m_NetworkManager.LocalClient.PlayerObject.gameObject, m_ScenesLoaded[sceneName]);
+                    }
+                }
+            }
+            else if (sessionOwner)
+            {
+                if (GUILayout.Button($"[Load] {sceneName}"))
+                {
+                    m_NetworkManager.SceneManager.LoadScene(sceneName, LoadSceneMode.Additive);
+                }
+            }
+        }
+        if (m_NetworkManager.LocalClient.PlayerObject != null)
+        {
+            if (SceneManager.GetActiveScene().name != m_NetworkManager.LocalClient.PlayerObject.gameObject.scene.name)
+            {
+                if (GUILayout.Button($"[Player Migrate] {SceneManager.GetActiveScene().name}"))
+                {
+                    SceneManager.MoveGameObjectToScene(m_NetworkManager.LocalClient.PlayerObject.gameObject, SceneManager.GetActiveScene());
+                }
+            }
+        }
+        GUILayout.EndArea();
+    }
+}
+
+[Serializable]
+public class SceneGroup
+{
+    [HideInInspector]
+    public string ActiveScene;
+
+    [HideInInspector]
+    public List<string> AdditiveScenes = new List<string>();
+
+#if UNITY_EDITOR    
+    public SceneAsset ActiveSceneToLoad;
+    public List<SceneAsset> ScenesToLoad;
+    public void OnValidateProcess()
+    {
+        if (ActiveSceneToLoad != null)
+        {
+            ActiveScene = ActiveSceneToLoad.name;
+        }
+        AdditiveScenes?.Clear();
+        foreach (var scene in ScenesToLoad)
+        {
+            if (scene == null) continue;
+            AdditiveScenes.Add(scene.name);
+        }
+    }
+#endif
+}
\ No newline at end of file
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingUI.cs.meta b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingHandler.cs.meta
similarity index 83%
rename from Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingUI.cs.meta
rename to Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingHandler.cs.meta
index 96adcd8d9..120e631f6 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingUI.cs.meta
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingHandler.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a67a779c7672cba4a998595b5f58a224
+guid: 0cd25a428f585ce4d96373fcebe859e1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingUI.cs b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingUI.cs
deleted file mode 100644
index 676723e12..000000000
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/Scripts/SceneLoadingUI.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-using System.Collections.Generic;
-using Unity.Netcode;
-#if UNITY_EDITOR
-using UnityEditor;
-#endif
-using UnityEngine;
-using UnityEngine.SceneManagement;
-
-
-public class SceneLoadingUI : MonoBehaviour
-{
-    [HideInInspector]
-    [SerializeField]
-    private List<string> m_SceneNames = new List<string>();
-
-    [HideInInspector]
-    [SerializeField]
-    private string m_TransitionToScene;
-
-#if UNITY_EDITOR
-    public SceneAsset TransistionToScene;
-    public List<SceneAsset> ScenesToLoad;
-    private void OnValidate()
-    {
-        m_SceneNames.Clear();
-        foreach (var scene in ScenesToLoad)
-        {
-            m_SceneNames.Add(scene.name);
-        }
-        if (TransistionToScene != null)
-        {
-            m_TransitionToScene = TransistionToScene.name;
-        }
-    }
-#endif
-
-    private Dictionary<string, Scene> m_ScenesLoaded = new Dictionary<string, Scene>();
-
-
-    private void Start()
-    {
-        if (NetworkManager.Singleton.IsListening)
-        {
-            if (NetworkManager.Singleton.IsConnectedClient)
-            {
-                NetworkManager.Singleton.OnClientStopped += OnClientStopped;
-                NetworkManager.Singleton.SceneManager.OnSceneEvent += OnSceneEvent;
-            }
-            else
-            {
-                NetworkManager.Singleton.OnClientConnectedCallback += OnClientConnectedCallback;
-            }
-        }
-        else
-        {
-            NetworkManager.Singleton.OnClientStarted += OnClientStarted;
-        }
-    }
-
-    private void UpdateSynchronizedScenes()
-    {
-        var scenesLoaded = NetworkManager.Singleton.SceneManager.GetSynchronizedScenes();
-        foreach (var scene in scenesLoaded)
-        {
-            if (!m_ScenesLoaded.ContainsKey(scene.name))
-            {
-                m_ScenesLoaded.Add(scene.name, scene);
-            }
-        }
-    }
-
-    private void OnClientConnectedCallback(ulong clientId)
-    {
-        if (NetworkManager.Singleton.LocalClientId == clientId)
-        {
-            NetworkManager.Singleton.OnClientConnectedCallback -= OnClientConnectedCallback;
-            UpdateSynchronizedScenes();
-        }
-    }
-
-    private void OnClientStarted()
-    {
-        NetworkManager.Singleton.OnClientStarted -= OnClientStarted;
-        NetworkManager.Singleton.OnClientStopped += OnClientStopped;
-
-        NetworkManager.Singleton.SceneManager.OnSceneEvent += OnSceneEvent;
-
-
-    }
-
-    private void OnSceneEvent(SceneEvent sceneEvent)
-    {
-        switch (sceneEvent.SceneEventType)
-        {
-            case SceneEventType.LoadComplete:
-                {
-                    if (sceneEvent.ClientId == NetworkManager.Singleton.LocalClientId)
-                    {
-                        if (!m_ScenesLoaded.ContainsKey(sceneEvent.SceneName))
-                        {
-                            m_ScenesLoaded.Add(sceneEvent.SceneName, sceneEvent.Scene);
-                        }
-                    }
-                    break;
-                }
-            case SceneEventType.UnloadComplete:
-                {
-                    if (sceneEvent.ClientId == NetworkManager.Singleton.LocalClientId)
-                    {
-                        if (m_ScenesLoaded.ContainsKey(sceneEvent.SceneName))
-                        {
-                            m_ScenesLoaded.Remove(sceneEvent.SceneName);
-                        }
-                    }
-                    break;
-                }
-        }
-    }
-
-    private void OnClientStopped(bool wasHost)
-    {
-        NetworkManager.Singleton.OnClientStopped -= OnClientStopped;
-        NetworkManager.Singleton.OnClientStarted += OnClientStarted;
-
-    }
-
-    private Vector2 m_ScrollPosition = Vector2.zero;
-
-    private void OnGUI()
-    {
-        if (!NetworkManager.Singleton || !NetworkManager.Singleton.IsConnectedClient) return;
-
-        GUILayout.BeginArea(new Rect(Screen.width - 200, 50, 190, 400));
-        var sessionOwner = NetworkManager.Singleton.LocalClient.IsSessionOwner;
-
-        if (sessionOwner)
-        {
-            if (GUILayout.Button($"[SingleMode] {m_TransitionToScene}"))
-            {
-                NetworkManager.Singleton.OnClientStopped -= OnClientStopped;
-                NetworkManager.Singleton.SceneManager.OnSceneEvent -= OnSceneEvent;
-                NetworkManager.Singleton.SceneManager.LoadScene(m_TransitionToScene, LoadSceneMode.Single);
-            }
-        }
-
-        foreach (var sceneName in m_SceneNames)
-        {
-            if (m_ScenesLoaded.ContainsKey(sceneName))
-            {
-                if (sessionOwner)
-                {
-                    if (GUILayout.Button($"[Unload] {sceneName}"))
-                    {
-                        NetworkManager.Singleton.SceneManager.UnloadScene(m_ScenesLoaded[sceneName]);
-                    }
-                }
-
-                if (NetworkManager.Singleton.LocalClient.PlayerObject.gameObject.scene.name != sceneName)
-                {
-                    if (GUILayout.Button($"[Player Migrate] {sceneName}"))
-                    {
-                        SceneManager.MoveGameObjectToScene(NetworkManager.Singleton.LocalClient.PlayerObject.gameObject, m_ScenesLoaded[sceneName]);
-                    }
-                }
-            }
-            else if (sessionOwner)
-            {
-                if (GUILayout.Button($"[Load] {sceneName}"))
-                {
-                    NetworkManager.Singleton.SceneManager.LoadScene(sceneName, UnityEngine.SceneManagement.LoadSceneMode.Additive);
-                }
-            }
-        }
-        if (NetworkManager.Singleton.LocalClient.PlayerObject != null)
-        {
-            if (SceneManager.GetActiveScene().name != NetworkManager.Singleton.LocalClient.PlayerObject.gameObject.scene.name)
-            {
-                if (GUILayout.Button($"[Player Migrate] {SceneManager.GetActiveScene().name}"))
-                {
-                    SceneManager.MoveGameObjectToScene(NetworkManager.Singleton.LocalClient.PlayerObject.gameObject, SceneManager.GetActiveScene());
-                }
-            }
-        }
-
-        if (NetworkManager.Singleton.DAHost)
-        {
-            if (NetworkManager.Singleton.ConnectedClientsIds.Count > 1 || !NetworkManager.Singleton.LocalClient.IsSessionOwner)
-            {
-                GUILayout.Label("Promote To Session Owner:");
-                m_ScrollPosition = GUILayout.BeginScrollView(m_ScrollPosition, GUILayout.Width(140), GUILayout.Height(100));
-                foreach (var clientId in NetworkManager.Singleton.ConnectedClientsIds)
-                {
-                    if (clientId == NetworkManager.Singleton.CurrentSessionOwner)
-                    {
-                        continue;
-                    }
-                }
-                GUILayout.EndScrollView();
-            }
-        }
-        GUILayout.EndArea();
-    }
-}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SerializationValidation.unity b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SerializationValidation.unity
new file mode 100644
index 000000000..f9e0dbda3
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SerializationValidation.unity
@@ -0,0 +1,643 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 10
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 0
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 12
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 1
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 1
+    m_PVRFilteringGaussRadiusAO: 1
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 3
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &302451789
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 302451793}
+  - component: {fileID: 302451792}
+  - component: {fileID: 302451791}
+  - component: {fileID: 302451790}
+  m_Layer: 0
+  m_Name: Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &302451790
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 302451789}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: 0
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
+  m_TaaSettings:
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
+--- !u!81 &302451791
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 302451789}
+  m_Enabled: 1
+--- !u!20 &302451792
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 302451789}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.01735494, g: 0.12066868, b: 0.2830189, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &302451793
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 302451789}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &994416665
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 994416667}
+  - component: {fileID: 994416666}
+  m_Layer: 0
+  m_Name: Global Volume
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &994416666
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 994416665}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IsGlobal: 1
+  priority: 0
+  blendDistance: 0
+  weight: 0.769
+  sharedProfile: {fileID: 11400000, guid: 9d3d9641216d2584f8703536c4bcfd5b, type: 2}
+--- !u!4 &994416667
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 994416665}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1396945283
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1396945285}
+  - component: {fileID: 1396945284}
+  - component: {fileID: 1396945286}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!108 &1396945284
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1396945283}
+  m_Enabled: 1
+  serializedVersion: 11
+  m_Type: 1
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 2
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_UseViewFrustumForShadowCasterCull: 1
+  m_ForceVisible: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+  m_LightUnit: 1
+  m_LuxAtDistance: 1
+  m_EnableSpotReflector: 1
+--- !u!4 &1396945285
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1396945283}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!114 &1396945286
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1396945283}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_UsePipelineSettings: 1
+  m_AdditionalLightsShadowResolutionTier: 2
+  m_LightLayerMask: 1
+  m_RenderingLayers: 1
+  m_CustomShadowLayers: 0
+  m_ShadowLayerMask: 1
+  m_ShadowRenderingLayers: 1
+  m_LightCookieSize: {x: 1, y: 1}
+  m_LightCookieOffset: {x: 0, y: 0}
+  m_SoftShadowQuality: 0
+--- !u!1 &2038204124
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2038204126}
+  - component: {fileID: 2038204125}
+  - component: {fileID: 2038204127}
+  m_Layer: 0
+  m_Name: InSceneSerialization
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2038204125
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2038204124}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 1251312286
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 4
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
+--- !u!4 &2038204126
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2038204124}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2038204127
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2038204124}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 41a6f321a7bcd1e49b41ebeedb31ea1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &2110025884
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2110025888}
+  - component: {fileID: 2110025887}
+  - component: {fileID: 2110025886}
+  - component: {fileID: 2110025885}
+  m_Layer: 0
+  m_Name: NetworkManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2110025885
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2110025884}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e4d8d44c602b97b47ba488a40c66267c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  NetStatsMonitor: {fileID: 0}
+  ResolutionFactor: 0.4
+  ConsoleLogVisible: 1
+  CanStartGame: 1
+  ByPassPoolLoading: 1
+  GravityMultiplier: 3
+  m_UseAlternateBackground: 1
+  AlternateBackground: {r: 0.2795924, g: 0.39967182, b: 0.5754717, a: 0}
+  m_DistributedAuthoritySettings:
+    Enabled: 1
+    UseRelay: 0
+    UseService: 1
+    UseLiveService: 0
+  m_Transport: {fileID: 2110025886}
+  ExitGameSceneName: BoostrapScene
+  m_ClientButtonLabel: DA-Client
+  m_HostButtonLabel: DA-Host
+  m_NetworkManager: {fileID: 2110025887}
+  DefaultRenderPipelineAsset: {fileID: 11400000, guid: 2ec3f65cdf5be794fa2b89cf6c79453d, type: 2}
+  MacRenderPipelineAsset: {fileID: 11400000, guid: 1d0495164249dbd4895b0bdee3b88cbb, type: 2}
+  ExitGameScene: {fileID: 102900000, guid: 96001d86fde72ec4baae413f655501af, type: 3}
+  ProgressBar: {fileID: 0}
+--- !u!114 &2110025886
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2110025884}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6960e84d07fb87f47956e7a81d71c4e6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ProtocolType: 0
+  m_UseWebSockets: 0
+  m_UseEncryption: 0
+  m_MaxPacketQueueSize: 1024
+  m_MaxPayloadSize: 81920
+  m_HeartbeatTimeoutMS: 500
+  m_ConnectTimeoutMS: 1000
+  m_MaxConnectAttempts: 60
+  m_DisconnectTimeoutMS: 30000
+  ConnectionData:
+    Address: 127.0.0.1
+    Port: 7777
+    ServerListenAddress: 127.0.0.1
+  DebugSimulator:
+    PacketDelayMS: 0
+    PacketJitterMS: 0
+    PacketDropRate: 0
+--- !u!114 &2110025887
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2110025884}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  NetworkConfig:
+    ProtocolVersion: 0
+    NetworkTransport: {fileID: 2110025886}
+    PlayerPrefab: {fileID: 0}
+    Prefabs:
+      NetworkPrefabsLists:
+      - {fileID: 11400000, guid: 3e3ce682a26375d40a565c5dedca3d05, type: 2}
+    TickRate: 30
+    ClientConnectionBufferTimeout: 10
+    ConnectionApproval: 0
+    ConnectionData: 
+    EnableTimeResync: 0
+    TimeResyncInterval: 30
+    EnsureNetworkVariableLengthSafety: 0
+    EnableSceneManagement: 1
+    ForceSamePrefabs: 1
+    RecycleNetworkIds: 1
+    NetworkIdRecycleDelay: 120
+    RpcHashSize: 0
+    LoadSceneTimeOut: 120
+    SpawnTimeout: 10
+    EnableNetworkLogs: 1
+    NetworkTopology: 1
+    UseCMBService: 1
+    AutoSpawnPlayerPrefabClientSide: 1
+    NetworkMessageMetrics: 0
+    NetworkProfilingMetrics: 0
+    OldPrefabList: []
+  RunInBackground: 1
+  LogLevel: 1
+--- !u!4 &2110025888
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2110025884}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 302451793}
+  - {fileID: 1396945285}
+  - {fileID: 2110025888}
+  - {fileID: 994416667}
+  - {fileID: 2038204126}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SerializationValidation.unity.meta b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SerializationValidation.unity.meta
new file mode 100644
index 000000000..2d35c2f80
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/SerializationValidation.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 47bc26a5afcc3504599ae86448de01fc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/StressTest.unity b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/StressTest.unity
index 3147dbe2c..2b21e651f 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/StressTest.unity
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/StressTest.unity
@@ -346,7 +346,7 @@ MonoBehaviour:
     PlayerPrefab: {fileID: 4336973376521349599, guid: d27ec9cc51a46614192af1bd95321d2c, type: 3}
     Prefabs:
       NetworkPrefabsLists:
-      - {fileID: 11400000, guid: 3e3ce682a26375d40a565c5dedca3d05, type: 2}
+      - {fileID: 11400000, guid: ee9589984c5b900469c9b451c0fbd909, type: 2}
     TickRate: 30
     ClientConnectionBufferTimeout: 10
     ConnectionApproval: 0
@@ -365,7 +365,7 @@ MonoBehaviour:
     NetworkTopology: 1
     UseCMBService: 1
     AutoSpawnPlayerPrefabClientSide: 1
-    NetworkMessageMetrics: 0
+    NetworkMessageMetrics: 1
     NetworkProfilingMetrics: 0
     OldPrefabList: []
   RunInBackground: 1
@@ -625,6 +625,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 4454842426221127108, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_Visible
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4454842426221127108, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
       propertyPath: <Configuration>k__BackingField
       value: 
@@ -639,7 +643,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4454842426221127109, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
       propertyPath: m_LocalScale.x
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/StressTestDemoPrefabs.asset b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/StressTestDemoPrefabs.asset
new file mode 100644
index 000000000..4285b0939
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/StressTestDemoPrefabs.asset
@@ -0,0 +1,21 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e651dbb3fbac04af2b8f5abf007ddc23, type: 3}
+  m_Name: StressTestDemoPrefabs
+  m_EditorClassIdentifier: 
+  IsDefault: 0
+  List:
+  - Override: 0
+    Prefab: {fileID: 4158041303636595323, guid: 68cd273741cf36c438d5f4d714d6fc14, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/StressTestDemoPrefabs.asset.meta b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/StressTestDemoPrefabs.asset.meta
new file mode 100644
index 000000000..cedf89ab9
--- /dev/null
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scenes/SmallDemos/StressTestDemoPrefabs.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ee9589984c5b900469c9b451c0fbd909
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/AsteroidSpawnManagement.cs b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/AsteroidSpawnManagement.cs
index 8a51d7d13..f355e42b8 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/AsteroidSpawnManagement.cs
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/AsteroidSpawnManagement.cs
@@ -49,23 +49,52 @@ public override void OnNetworkSpawn()
 
         if (IsSessionOwner)
         {
+#if SESSION_STORE_ENABLED
             // Don't try to spawn more asteroids if the session is already initialized
             if (!m_IsAsteroidFieldInitialized.Value)
+#endif
             {
                 StartCoroutine(SpawnInitialField());
             }
+#if SESSION_STORE_ENABLED
             else
             {
                 StartCoroutine(GetAsteroidPool());
             }
+#endif
         }
         else
         {
             StartCoroutine(GetAsteroidPool());
         }
+        NetworkManager.OnSessionOwnerPromoted += OnSessionOwnerPromoted;
         base.OnNetworkSpawn();
     }
 
+    public override void OnNetworkDespawn()
+    {
+        NetworkManager.OnSessionOwnerPromoted -= OnSessionOwnerPromoted;
+        base.OnNetworkDespawn();
+    }
+
+    private void OnSessionOwnerPromoted(ulong sessionOwnerPromoted)
+    {
+        if (NetworkManager.LocalClientId == sessionOwnerPromoted && !IsOwner)
+        {
+            NetworkObject.ChangeOwnership(NetworkManager.LocalClientId);
+        }
+    }
+
+    protected override void OnOwnershipChanged(ulong previous, ulong current)
+    {
+        if (IsSessionOwner && current != NetworkManager.LocalClientId)
+        {
+            NetworkManagerHelper.Instance.LogMessage($"[{name}] In-Scene placed NetworkObject changed ownership to Client-{current} who is not the session owner! (Reverting)");
+            NetworkObject.ChangeOwnership(NetworkManager.LocalClientId);
+        }
+        base.OnOwnershipChanged(previous, current);
+    }
+
     private IEnumerator GetAsteroidPool()
     {
         var waitUntilPoolAvailable = new WaitForSeconds(1.0f);
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/ManagementInput.cs b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/ManagementInput.cs
index acd682668..febae66cb 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/ManagementInput.cs
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/ManagementInput.cs
@@ -6,6 +6,7 @@
 #endif
 using Unity.Netcode;
 using UnityEngine;
+using UnityEngine.Rendering;
 
 public class ManagementInput : NetworkBehaviour
 {
@@ -22,7 +23,7 @@ public class ManagementInput : NetworkBehaviour
     private void Awake()
     {
 #if MULTIPLAYER_TOOLS
-        RuntimeNetStatsMonitor?.gameObject.SetActive(false);
+        RuntimeNetStatsMonitor.Visible = false;
 #endif
     }
 
@@ -34,9 +35,34 @@ public override void OnNetworkSpawn()
         {
             InterestOverlayHandler.Singleton.SetPlayerColor(PlayerColor.GetPlayerColor(NetworkManager.LocalClientId));
         }
+        NetworkManager.OnSessionOwnerPromoted += OnSessionOwnerPromoted;
         base.OnNetworkSpawn();
     }
 
+    public override void OnNetworkDespawn()
+    {
+        NetworkManager.OnSessionOwnerPromoted -= OnSessionOwnerPromoted;
+        base.OnNetworkDespawn();
+    }
+
+    private void OnSessionOwnerPromoted(ulong sessionOwnerPromoted)
+    {
+        if (NetworkManager.LocalClientId == sessionOwnerPromoted && !IsOwner)
+        {
+            NetworkObject.ChangeOwnership(NetworkManager.LocalClientId);
+        }
+    }
+
+    protected override void OnOwnershipChanged(ulong previous, ulong current)
+    {
+        if (IsSessionOwner && current != NetworkManager.LocalClientId)
+        {
+            NetworkManagerHelper.Instance.LogMessage($"[{name}] In-Scene placed NetworkObject changed ownership to Client-{current} who is not the session owner! (Reverting)");
+            NetworkObject.ChangeOwnership(NetworkManager.LocalClientId);
+        }
+        base.OnOwnershipChanged(previous, current);
+    }
+
     private void OnObjectOwnerInstancesAreActiveChanged(bool previous, bool newValue)
     {
         ObjectOwnerColor.ToggleOwnerColorSphere(newValue);
@@ -99,6 +125,7 @@ private void Update()
             m_SpawnCountForQuery = NetworkManager.SpawnManager.SpawnedObjects.Count;
             m_SpawnCountClientCount = NetworkManager.ConnectedClientsIds.Count;
             QuerySpawnCountRpc(m_SpawnCountForQuery);
+            CheckSpawnCount();
         }
 
         if (Input.GetKeyDown(KeyCode.P))
@@ -118,7 +145,7 @@ private void Update()
         // Toggle the RNSM tool
         if (Input.GetKeyDown(KeyCode.N) || Input.GetKeyDown(KeyCode.Tab))
         {
-            RuntimeNetStatsMonitor?.gameObject.SetActive(!RuntimeNetStatsMonitor.gameObject.activeInHierarchy);
+            RuntimeNetStatsMonitor.Visible = !RuntimeNetStatsMonitor.Visible;
         }
 #endif
     }
@@ -129,6 +156,29 @@ private void Update()
     private Dictionary<ulong, int> m_RemoteSpawnCount = new Dictionary<ulong, int>();
     private Dictionary<ulong, List<ulong>> m_RemoteInvalidSpawnCount = new Dictionary<ulong, List<ulong>>();
 
+    private void CheckSpawnCount()
+    {
+        var clientSpawnedObjects = new Dictionary<ulong, List<NetworkObject>>();
+        var totalSpawnedObjects = 0;
+        foreach(var clientId in NetworkManager.ConnectedClientsIds)
+        {
+            var spawnedObjects = NetworkManager.SpawnManager.GetClientOwnedObjects(clientId).ToList();
+            totalSpawnedObjects += spawnedObjects.Count;
+            clientSpawnedObjects.Add(clientId, spawnedObjects);
+        }
+
+        if (totalSpawnedObjects != NetworkManager.SpawnManager.SpawnedObjectsList.Count)
+        {
+            var builder = new StringBuilder();
+            builder.AppendLine($"[Client-{NetworkManager.LocalClientId}] Spawned Object Count By Client:");
+            foreach(var entry in clientSpawnedObjects)
+            {
+                builder.AppendLine($"[Client-{entry.Key}] Spawned Object Count: {entry.Value.Count}");
+            }
+        }
+
+    }
+
     [Rpc(SendTo.NotMe)]
     private void QuerySpawnCountRpc(int count, RpcParams rpcParams = default)
     {
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/MinbotSpawnManagement.cs b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/MinbotSpawnManagement.cs
index 177c67a1c..f21a1cec2 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/MinbotSpawnManagement.cs
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/MinbotSpawnManagement.cs
@@ -33,22 +33,26 @@ public override void OnNetworkSpawn()
                 Destroy(manager.gameObject);
             }
         }
-
+        NetworkManager.OnSessionOwnerPromoted += OnSessionOwnerPromoted;
         if (ObjectPoolSystem.ExistingPoolSystems.ContainsKey(MinbotPrefab))
         {
             MinbotPoolSystem = ObjectPoolSystem.ExistingPoolSystems[MinbotPrefab];
         }
         if (IsSessionOwner)
         {
+#if SESSION_STORE_ENABLED
             // Don't try to spawn more minobots if the session is already initialized
             if (!m_AreMinebotsInitialized.Value)
+#endif
             {
                 StartCoroutine(SpawnInitialField());
             }
+#if SESSION_STORE_ENABLED
             else
             {
                 StartCoroutine(GetMinebotPool());
             }
+#endif
         }
         else
         {
@@ -57,6 +61,30 @@ public override void OnNetworkSpawn()
         base.OnNetworkSpawn();
     }
 
+    public override void OnNetworkDespawn()
+    {
+        NetworkManager.OnSessionOwnerPromoted -= OnSessionOwnerPromoted;
+        base.OnNetworkDespawn();
+    }
+
+    private void OnSessionOwnerPromoted(ulong sessionOwnerPromoted)
+    {
+        if (NetworkManager.LocalClientId == sessionOwnerPromoted && !IsOwner)
+        {
+            NetworkObject.ChangeOwnership(NetworkManager.LocalClientId);
+        }
+    }
+
+    protected override void OnOwnershipChanged(ulong previous, ulong current)
+    {
+        if (IsSessionOwner && current != NetworkManager.LocalClientId)
+        {
+            NetworkManagerHelper.Instance.LogMessage($"[{name}] In-Scene placed NetworkObject changed ownership to Client-{current} who is not the session owner! (Reverting)");
+            NetworkObject.ChangeOwnership(NetworkManager.LocalClientId);
+        }
+        base.OnOwnershipChanged(previous, current);
+    }
+
     private IEnumerator GetMinebotPool()
     {
         var waitUntilPoolAvailable = new WaitForSeconds(1.0f);
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/MinebotMotion.cs b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/MinebotMotion.cs
index 55a35af48..0d10da39d 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/MinebotMotion.cs
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/MinebotMotion.cs
@@ -94,6 +94,10 @@ public void ReleaseMine(Vector3 direction, Vector3 velocity)
     public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject)
     {
         base.OnNetworkObjectParentChanged(parentNetworkObject);
+        if (!IsSpawned)
+        {
+            return;
+        }
 
         if (parentNetworkObject != null)
         {
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/NetworkManagerHelper.cs b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/NetworkManagerHelper.cs
index f4cb6d29c..f9a200086 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/NetworkManagerHelper.cs
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/NetworkManagerHelper.cs
@@ -4,11 +4,8 @@
 using System.Threading.Tasks;
 using Unity.Netcode;
 using Unity.Netcode.Transports.UTP;
-using Unity.Networking.Transport;
-using Unity.Networking.Transport.Relay;
 
 #if MULTIPLAYER_TOOLS
-using Unity.Multiplayer.Tools.NetStats;
 using Unity.Multiplayer.Tools.NetStatsMonitor;
 #endif
 
@@ -29,6 +26,7 @@
 public class NetworkManagerHelper : MonoBehaviour, IPoolSystemTracker
 {
     public static NetworkManagerHelper Instance;
+    private static string s_ProfileName;
 
 #if MULTIPLAYER_TOOLS
     [Tooltip("Assign an in-scene placed net stats monitor prefab here for it to be available to other components.")]
@@ -62,8 +60,6 @@ public struct DistributedAuthoritySettings
         [Tooltip("When enabled, clients will only connect to the CMB Services server hosted on GSH. You can only start a NetworkManager as a client in this mode.")]
         public bool UseLiveService;
 
-
-
         public bool UsingService()
         {
             return Enabled && UseService;
@@ -101,11 +97,65 @@ public bool UsingLiveService()
 
     public RenderPipelineAsset DefaultRenderPipelineAsset;
     public RenderPipelineAsset MacRenderPipelineAsset;
-
+    public ProgressFill ProgressBar;
     public bool IsRunningOSX { get; private set; }
 
     private string RenderingPath = "Forward+";
 
+    public enum StartModes
+    {
+        Client,
+        Host,
+        DAClient
+    }
+
+    public Action<StartModes> OnStarted;
+
+    public Action OnExiting;
+    public Action OnShuttingDown;
+
+    private float[] m_DeltaTimes = new float[60];
+    private int[] m_DeltaTicks = new int[60];
+    private int m_DeltaTickIndex;
+    private int m_DeltaTimeIndex;
+
+    private int m_DeltaTick;
+    private float m_DeltaTime;
+    private float m_DeltaDivide = 1.0f / 60.0f;
+
+    private static string s_SessionName = string.Empty;
+    private Task m_SessionTask;
+
+    private bool m_PooledObjectsLoaded;
+
+    private Dictionary<ObjectPoolSystem, float> m_PoolSystemsLoading = new Dictionary<ObjectPoolSystem, float>();
+    private int m_CurrentOwnedObjectCount;
+    private float m_LastObjectCountUpdate;
+    private Vector3 StandardGravity = new Vector3(0.0f, -9.81f, 0.0f);
+    private ISession m_CurrentSession;
+    private bool m_OriginalConsoleLogVisibilitySetting;
+
+    /// <summary>
+    /// Only used when connected to a live distributed
+    /// authority session.
+    /// </summary>
+    public enum SessionStates
+    {
+        None,
+        Joining,
+        Joined,
+        Leaving,
+    }
+
+    /// <summary>
+    /// Only used when connected to a live distributed
+    /// authority session.
+    /// </summary>
+    private SessionStates m_SessionState;
+    private string m_RelayJoinCode;
+    private Allocation m_Allocation;
+
+
 #if UNITY_EDITOR
     public SceneAsset ExitGameScene;
     private void OnValidate()
@@ -128,10 +178,6 @@ private void UpdateSessionMode()
         m_ClientButtonLabel = m_DistributedAuthoritySettings.Enabled ? "DA-Client" : "Client";
     }
 
-    public ProgressFill ProgressBar;
-
-
-
     private void Awake()
     {
         m_OriginalSettings = m_DistributedAuthoritySettings;
@@ -156,45 +202,33 @@ private void Awake()
         Screen.SetResolution((int)(Screen.currentResolution.width * ResolutionFactor), (int)(Screen.currentResolution.height * ResolutionFactor), FullScreenMode.Windowed);
 
         m_NetworkManager.SetSingleton();
-
         ObjectPoolSystem.PoolSystemTrackerRegistration(this);
     }
 
     private async void Start()
     {
         Instance = this;
-        //var initoptions = new InitializationOptions();
-        //initoptions.SetProfile(GetRandomString(5));
-        await UnityServices.InitializeAsync();
+        if (UnityServices.Instance != null && UnityServices.Instance.State != ServicesInitializationState.Initialized)
+        {
+            await UnityServices.InitializeAsync();
+        }
 
         if (!AuthenticationService.Instance.IsSignedIn)
         {
             AuthenticationService.Instance.SignInFailed += SignInFailed;
             AuthenticationService.Instance.SignedIn += SignedIn;
-            AuthenticationService.Instance.SwitchProfile(GetRandomString(5));
+            if (string.IsNullOrEmpty(s_ProfileName))
+            {
+                s_ProfileName = GetRandomString(5);
+            }
+            AuthenticationService.Instance.SwitchProfile(s_ProfileName);
             await AuthenticationService.Instance.SignInAnonymouslyAsync();
         }
-        //else
-        //{
-        //    // When signing out is no longer broken, we can shift this down to when the NetworkManager
-        //    // stops.
-        //    AuthenticationService.Instance.SignInFailed -= SignInFailed;
-        //    AuthenticationService.Instance.SignedIn -= SignedIn;
-        //    AuthenticationService.Instance.SignedOut += SignedOutOfServices;
-        //    try
-        //    {
-        //        AuthenticationService.Instance.SignOut();
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        Debug.LogException(ex);
-        //    }
-        //}
 
 #if MULTIPLAYER_TOOLS
         if (NetStatsMonitor != null)
         {
-            NetStatsMonitor.gameObject.SetActive(false);
+            NetStatsMonitor.Visible = false;
         }
 #endif
     }
@@ -232,11 +266,11 @@ public void ToggleNetStatsMonitor(bool disable = false)
             }
             if (disable)
             {
-                NetStatsMonitor.gameObject.SetActive(false);
+                NetStatsMonitor.Visible = false;
             }
             else
             {
-                NetStatsMonitor.gameObject.SetActive(!NetStatsMonitor.gameObject.activeInHierarchy);
+                NetStatsMonitor.Visible = !NetStatsMonitor.Visible;
             }
 
         }
@@ -257,57 +291,15 @@ private void SignInFailed(RequestFailedException error)
         Debug.LogError($"Failed to sign in anonymously: {error}");
     }
 
-    private async void SignedOutOfServices()
-    {
-        AuthenticationService.Instance.SignedOut -= SignedOutOfServices;
-        //AuthenticationService.Instance.SwitchProfile(GetRandomString(5));
-        AuthenticationService.Instance.SignInFailed += SignInFailed;
-        AuthenticationService.Instance.SignedIn += SignedIn;
-
-        await AuthenticationService.Instance.SignInAnonymouslyAsync();
-    }
-
-    static string GetRandomString(int length)
+    public static string GetRandomString(int length)
     {
         var r = new Random();
-        return new String(Enumerable.Range(0, length).Select(_ => (Char)r.Next('a', 'z')).ToArray());
+        return new string(Enumerable.Range(0, length).Select(_ => (Char)r.Next('a', 'z')).ToArray());
     }
 
-    public enum StartModes
-    {
-        Client,
-        Host,
-        DAClient
-    }
-
-    public Action<StartModes> OnStarted;
-
-    public Action OnExiting;
-
-    private float[] m_DeltaTimes = new float[60];
-    private int[] m_DeltaTicks = new int[60];
-    private int m_DeltaTickIndex;
-    private int m_DeltaTimeIndex;
-
-    private int m_DeltaTick;
-    private float m_DeltaTime;
-    private float m_DeltaDivide = 1.0f / 60.0f;
-
-    private string m_SessionName = string.Empty;
-    private Task m_SessionTask;
-
-    private bool m_PooledObjectsLoaded;
-
-    private Dictionary<ObjectPoolSystem, float> m_PoolSystemsLoading = new Dictionary<ObjectPoolSystem, float>();
-    private int m_CurrentOwnedObjectCount;
-    private float m_LastObjectCountUpdate;
-    private Vector3 StandardGravity = new Vector3(0.0f, -9.81f, 0.0f);
-
-
-    private ISession m_LastSession;
     public string GetSessionName()
     {
-        return m_SessionName == string.Empty ? "LocalService" : m_SessionName;
+        return s_SessionName == string.Empty ? "LocalService" : s_SessionName;
     }
 
     private void AverageDeltaTime()
@@ -494,16 +486,44 @@ private void OnGUI()
             {
                 if (m_DistributedAuthoritySettings.UsingLiveService())
                 {
-                    GUI.enabled = m_SessionTask == null || m_SessionTask.IsCompleted;
+                    GUI.enabled = m_SessionState == SessionStates.None;
+                    if (m_SessionState == SessionStates.None)
+                    {
+                        GUILayout.Label("Session Name", GUILayout.Width(100));
 
-                    GUILayout.Label("Session Name", GUILayout.Width(100));
-                    m_SessionName = GUILayout.TextField(m_SessionName);
-                    if (GUILayout.Button("Connect"))
+                        s_SessionName = GUILayout.TextField(s_SessionName);
+
+                        if (GUILayout.Button("Connect"))
+                        {
+                            m_OriginalConsoleLogVisibilitySetting = ConsoleLogVisible;
+                            ConsoleLogVisible = true;
+                            LogMessage($"Connecting through live service", forceMessage: true);
+                            m_SessionState = SessionStates.Joining;
+                            m_SessionTask = ConnectThroughLiveService();
+                        }
+
+                        GUI.enabled = true;
+                    }
+                    else
                     {
-                        m_SessionTask = ConnectThroughLiveService(m_SessionName, true);
+                        switch (m_SessionState)
+                        {
+                            case SessionStates.Joining:
+                                {
+                                    if (m_SessionTask != null && m_SessionTask.IsCompletedSuccessfully)
+                                    {
+                                        m_SessionState = SessionStates.Joined;
+                                        m_SessionTask = null;
+                                    }
+                                    break;
+                                }
+                            case SessionStates.Leaving:
+                                {
+                                    GUILayout.Label("Leaving session...", GUILayout.Width(100));
+                                    break;
+                                }
+                        }
                     }
-
-                    GUI.enabled = true;
                 }
                 else
                 {
@@ -514,7 +534,7 @@ private void OnGUI()
                     GUILayout.Label("Port:", GUILayout.Width(100));
                     var portString = GUILayout.TextField(unityTransport.ConnectionData.Port.ToString(), GUILayout.Width(100));
                     ushort.TryParse(portString, out unityTransport.ConnectionData.Port);
-                    
+
                     // CMB distributed authority services just "connects" with no host, client, or server option (all are clients)
                     if (GUILayout.Button("Connect"))
                     {
@@ -559,7 +579,16 @@ private void OnGUI()
                     }
                 }
             }
-
+            if (ConsoleLogVisible && m_MessageLogs.Count > 0)
+            {
+                GUILayout.Label("-----------(Log)-----------");
+                // Display any messages logged to screen
+                foreach (var messageLog in m_MessageLogs)
+                {
+                    GUILayout.Label(messageLog.Message);
+                }
+                GUILayout.Label("---------------------------");
+            }
             GUILayout.EndArea();
 
             GUILayout.BeginArea(new Rect(10, Display.main.renderingHeight - 40, Display.main.renderingWidth - 10, 30));
@@ -572,6 +601,10 @@ private void OnGUI()
             }
             GUILayout.Label(scenesPreloaded.ToString());
             GUILayout.EndArea();
+            if (m_SessionState == SessionStates.Leaving)
+            {
+                return;
+            }
             // Exit to main menu
             GUILayout.BeginArea(new Rect(Display.main.renderingWidth - 100, 10, 80, 35));
             if (!m_SelectedSessionType && GUILayout.Button("Main Menu"))
@@ -596,18 +629,24 @@ private void OnGUI()
             {
                 GUILayout.Label($"Join Code: {m_RelayJoinCode}");
             }
+            else if (m_DistributedAuthoritySettings.UsingLiveService() && m_CurrentSession != null)
+            {
+                GUILayout.Label($"Session: {m_CurrentSession.Name}");
+            }
 
-            if (m_Transport != null)
+            if (m_NetworkManager.IsListening && m_Transport != null)
             {
-                GUILayout.Label($"{RenderingPath} | Frame Time: {(int)m_DeltaTime}ms |Latency: {m_Transport.GetCurrentRtt(NetworkManager.ServerClientId)}ms");
+                if (m_NetworkManager.NetworkConfig.NetworkTransport != m_Transport)
+                {
+                    m_Transport = m_NetworkManager.NetworkConfig.NetworkTransport;
+                }
+                GUILayout.Label($"{RenderingPath} | Frame Time: {(int)m_DeltaTime}ms | Latency: {m_Transport.GetCurrentRtt(NetworkManager.ServerClientId)}ms");
             }
 
             GUILayout.Label($"DeltaTick: {m_DeltaTick} TicksAgo: {NetworkTransform.GetTickLatency()}");
 
             var networkManager = m_NetworkManager;
             GUILayout.Label($"Spawned: {m_NetworkManager.SpawnManager.SpawnedObjectsList.Count} Owned: {GetOwnedObjectCount(ref networkManager)}");
-            //var currentTimeSync = networkManager.NetworkTimeSystem.CurrentTimeSyncInfo;
-            //GUILayout.Label($"[{currentTimeSync.TimeSyncs}] LRTT: {currentTimeSync.LastSyncedRttSec} LSST: {currentTimeSync.LastSyncedServerTimeSec} STO:{currentTimeSync.DesiredServerTimeOffset} LTO: {currentTimeSync.DesiredLocalTimeOffset}");
 
             if (ConsoleLogVisible && m_MessageLogs.Count > 0)
             {
@@ -620,21 +659,32 @@ private void OnGUI()
                 GUILayout.Label("---------------------------");
             }
             GUILayout.EndArea();
-            // Exit
-            GUILayout.BeginArea(new Rect(Display.main.renderingWidth - 40, 10, 30, 30));
-            if (GUILayout.Button("X"))
+
+            if (m_SessionState != SessionStates.Leaving)
             {
-                m_NetworkManager.Shutdown();
-                m_SelectedSessionType = false;
-                m_SessionType = SessionTypes.None;
+                // Exit
+                GUILayout.BeginArea(new Rect(Display.main.renderingWidth - 40, 10, 30, 30));
+                if (GUILayout.Button("X"))
+                {
+                    OnShuttingDown?.Invoke();
+                    // If connected to a live service session, then shutdown by leaving the session
+                    if (m_CurrentSession != null && (m_SessionState == SessionStates.Joined || m_SessionState == SessionStates.Joining))
+                    {
+                        m_CurrentSession.LeaveAsync();
+                    }
+                    else // Otherwise, shutdown normally
+                    {
+                        m_NetworkManager.Shutdown();
+                    }
+                    m_SelectedSessionType = false;
+                    m_SessionType = SessionTypes.None;
+                }
+
+                GUILayout.EndArea();
             }
-            GUILayout.EndArea();
         }
     }
 
-    private string m_RelayJoinCode;
-    private Allocation m_Allocation;
-
     private async void StartHostWithRelay(int maxConnections = 15)
     {
         await UnityServices.InitializeAsync();
@@ -698,85 +748,128 @@ private void OnClientStarted()
         m_NetworkManager.SceneManager.PostSynchronizationSceneUnloading = true;
     }
 
-    private async Task ConnectThroughLiveService(string sessionName, bool distributedAuthority)
+    private async Task<ISession> ConnectThroughLiveService()
     {
+        var sessionName = s_SessionName;
         try
         {
-            var options = new CreateSessionOptions(100)
+            m_NetworkManager.OnClientStopped -= OnNetworkManagerStopped;
+            m_NetworkManager.OnClientStopped += OnNetworkManagerStopped;
+            m_NetworkManager.OnClientDisconnectCallback += OnClientDisconnectCallback;
+            m_NetworkManager.OnClientConnectedCallback += OnClientConnectedCallback;
+            // An attempt to avoid lobby cache issue
+            sessionName += $"-{SceneManager.GetActiveScene().name}";
+            var options = new SessionOptions()
             {
                 Name = sessionName,
-                MaxPlayers = 100,
-            };
+                MaxPlayers = 32
+            }.WithDistributedAuthorityNetwork();
+
+            m_CurrentSession = await MultiplayerService.Instance.CreateOrJoinSessionAsync(sessionName, options);
+            m_CurrentSession.RemovedFromSession += RemovedFromSession;
+            m_CurrentSession.StateChanged += CurrentSession_StateChanged;
+            OnStarted?.Invoke(StartModes.DAClient);
+            ConsoleLogVisible = m_OriginalConsoleLogVisibilitySetting;
+            m_SessionState = SessionStates.Joined;
+            return m_CurrentSession;
+        }
+        catch (Exception e)
+        {
+            m_SessionState = SessionStates.None;
+            LogMessage(e.Message, 20, forceMessage: true);
+            Debug.LogException(e);
+        }
+        return null;
+    }
+
+    private void ExitedSession()
+    {
+        m_CurrentSession.RemovedFromSession -= RemovedFromSession;
+        m_CurrentSession.StateChanged -= CurrentSession_StateChanged;
+        m_SessionState = SessionStates.None;
+        m_CurrentSession = null;
+    }
 
-            if (m_LastSession == null)
+    private void CurrentSession_StateChanged(Unity.Services.Multiplayer.SessionState sessionState)
+    {
+        if (sessionState == Unity.Services.Multiplayer.SessionState.Disconnected)
+        {
+            ExitedSession();
+        }
+    }
+
+    private void RemovedFromSession()
+    {
+        ExitedSession();
+    }
+
+    private void OnClientDisconnectCallback(ulong clientId)
+    {
+        if (m_NetworkManager.LocalClientId == clientId)
+        {
+            m_NetworkManager.OnClientDisconnectCallback -= OnClientDisconnectCallback;
+            if (!string.IsNullOrEmpty(m_NetworkManager.DisconnectReason))
             {
-                m_LastSession = await MultiplayerService.Instance.CreateOrJoinSessionAsync(sessionName, options.WithDistributedConnection());
+                LogMessage($"[Client-{clientId}][Disconnected] {m_NetworkManager.DisconnectReason}", forceMessage: true);
             }
             else
             {
-                await MultiplayerService.Instance.JoinSessionByIdAsync(m_LastSession.Id);
+                LogMessage($"[Client-{clientId}][Disconnected]", forceMessage: true);
             }
-
-            m_NetworkManager.OnClientStopped += OnNetworkManagerStopped;
-            OnStarted?.Invoke(distributedAuthority ? StartModes.DAClient : m_NetworkManager.IsHost ? StartModes.Host : StartModes.Client);
         }
-        catch (Exception e)
+        else
         {
-            Debug.LogException(e);
+            LogMessage($"[Client-{clientId}][Disconnected]", forceMessage: true);
         }
     }
 
-    private async void OnNetworkManagerStopped(bool obj)
+    private void OnClientConnectedCallback(ulong clientId)
+    {
+        if (m_NetworkManager.LocalClientId == clientId)
+        {
+            m_NetworkManager.OnClientConnectedCallback -= OnClientConnectedCallback;
+            ConsoleLogVisible = m_OriginalConsoleLogVisibilitySetting;
+        }
+    }
+
+    private void OnNetworkManagerStopped(bool obj)
     {
         m_NetworkManager.OnClientStopped -= OnNetworkManagerStopped;
         ObjectOwnerColor.Reset();
         PlayerColor.Reset();
-
+        if (!string.IsNullOrEmpty(m_NetworkManager.DisconnectReason))
+        {
+            LogMessage($"[Client][Disconnected] {m_NetworkManager.DisconnectReason}", forceMessage: true);
+        }
         if (m_DistributedAuthoritySettings.UseRelay)
         {
             m_Allocation = null;
             m_RelayJoinCode = string.Empty;
         }
-        if (m_LastSession != null)
+
+        if (m_SessionState == SessionStates.Joined)
         {
-            await m_LastSession.LeaveAsync();
+            m_SessionState = SessionStates.Leaving;
         }
 
         ToggleNetStatsMonitor(true);
-
-
-        // When signing out is no longer broken, we can shift this down to when the NetworkManager
-        // stops.
-        //AuthenticationService.Instance.SignedOut += SignedOutOfServices;
-        //try
-        //{
-        //    AuthenticationService.Instance.SignOut();
-        //}
-        //catch (Exception ex)
-        //{
-        //    Debug.LogException(ex);
-        //}
-
-        //
-        //m_LastSession = null;
     }
 
     private void LoadExitScene()
     {
-        if (m_LastSession != null)
-        {
-            m_LastSession = null;
-        }
         OnExiting?.Invoke();
         if (!string.IsNullOrEmpty(ExitGameSceneName))
         {
+            // This assures this instance is destroyed when we load the main menu
             SceneManager.MoveGameObjectToScene(gameObject, SceneManager.GetActiveScene());
             SceneManager.LoadScene(ExitGameSceneName, LoadSceneMode.Single);
         }
+        else
+        {
+            LogMessage("Warning: No exit game scene defined!", 20, forceMessage: true);
+        }
     }
 
-
-
     private int GetOwnedObjectCount(ref NetworkManager networkManager)
     {
         if (m_LastObjectCountUpdate < Time.realtimeSinceStartup)
@@ -788,9 +881,6 @@ private int GetOwnedObjectCount(ref NetworkManager networkManager)
         return m_CurrentOwnedObjectCount;
     }
 
-
-
-
     /// <summary>
     /// Invoked when a network session is active
     /// </summary>
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/PhysicsObjectMotion.cs b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/PhysicsObjectMotion.cs
index e350cb359..36cbe23bc 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/PhysicsObjectMotion.cs
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/PhysicsObjectMotion.cs
@@ -248,7 +248,9 @@ public override void OnNetworkSpawn()
             // Since state can be preserved during a CMB service connection when there are no clients connected,
             // this section determines whether we need to initialize the physics object or just apply the last
             // known velocities.
+#if SESSION_STORE_ENABLED
             if (!BeenInitialized.Value)
+#endif
             {
                 BeenInitialized.Value = true;
                 var torque = GetRandomVector3(MinMaxStartingTorque, Vector3.one, true);
@@ -259,11 +261,13 @@ public override void OnNetworkSpawn()
                 Rigidbody.AddForce(force, ForceMode.Impulse);
                 UpdateImpulseForce(force);
             }
+#if SESSION_STORE_ENABLED
             else
             {
                 Rigidbody.angularVelocity = Vector3.ClampMagnitude(GetObjectAngularVelocity(), MaxAngularVelocity);
                 SetObjectVelocity(Vector3.ClampMagnitude(GetObjectVelocity(), MaxVelocity));
             }
+#endif
         }
     }
 
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/ShipController.cs b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/ShipController.cs
index 5bf640912..5328b3028 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/ShipController.cs
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/Scripts/ShipController.cs
@@ -229,6 +229,16 @@ private void OnTractorBeamChanged(bool previous, bool next)
         UpdateTractorBeam();
     }
 
+    private void DetachMineFromShip()
+    {
+        m_Minebot.NetworkRigidbody.DetachFromFixedJoint();
+        IgnoreCollision(m_Minebot.gameObject, gameObject, false);
+        m_Minebot.ReleaseMine(transform.forward, GetObjectVelocity());
+        m_Minebot = null;
+        m_MinebotLocked = false;
+        m_MinebotLocking = false;
+    }
+
     /// <summary>
     /// Handles the tractor beam logic
     /// </summary>
@@ -243,12 +253,7 @@ private void TractorBeamUpdate()
                     if (m_Minebot != null)
                     {
                         // Detatch the mine (if attached)
-                        m_Minebot.NetworkRigidbody.DetachFromFixedJoint();
-                        IgnoreCollision(m_Minebot.gameObject, gameObject, false);
-                        m_Minebot.ReleaseMine(transform.forward, GetObjectVelocity());
-                        m_Minebot = null;
-                        m_MinebotLocked = false;
-                        m_MinebotLocking = false;
+                        DetachMineFromShip();
                     }
                     else
                     {
@@ -267,11 +272,7 @@ private void TractorBeamUpdate()
                     if (m_Minebot != null)
                     {
                         // Detatch the mine (if attached)
-                        m_Minebot.NetworkRigidbody.DetachFromFixedJoint();
-                        IgnoreCollision(m_Minebot.gameObject, gameObject, false);
-                        m_Minebot.ReleaseMine(transform.forward, GetObjectVelocity());
-                        m_Minebot = null;
-                        m_MinebotLocked = false;
+                        DetachMineFromShip();
                     }
                     if (!m_MinebotLocking)
                     {
@@ -581,6 +582,14 @@ public override void OnNetworkSpawn()
         // to doing any child specific spawn initialization.
         base.OnNetworkSpawn();
 
+        if (!Rigidbody.isKinematic)
+        {
+            Rigidbody.angularVelocity = Vector3.zero;
+            Rigidbody.linearVelocity = Vector3.zero;
+        }
+
+        NetworkManagerHelper.Instance.OnShuttingDown += OnShuttingDown;
+
         // Assure the name of the ship remains the same, but the spawned
         // name is specific to the authority instance. This is primarily
         // since we are using pools and players can connect and disconnect
@@ -628,9 +637,7 @@ public override void OnNetworkSpawn()
     protected override void OnNetworkPostSpawn()
     {
         PlayerIdentifier.text = $"Player-{OwnerClientId}";
-
         InterestShipMarker.color = PlayerColor.GetPlayerColor(OwnerClientId);
-
         base.OnNetworkPostSpawn();
     }
 
@@ -647,6 +654,19 @@ private IEnumerator WaitToTeleport()
         m_SpawnAtLocation = true;
     }
 
+    private void OnShuttingDown()
+    {
+        NetworkManagerHelper.Instance.OnShuttingDown -= OnShuttingDown;
+        if (!Rigidbody.isKinematic) 
+        {
+            Rigidbody.angularVelocity = Vector3.zero;
+            Rigidbody.linearVelocity = Vector3.zero;
+        }
+        m_RotationRate = 0.0f;
+        m_RotationThrust = 0.0f;
+        m_ForwardThrust = 0.0f;
+    }
+
     public override void OnNetworkDespawn()
     {
         gameObject.name = m_OriginalName;
@@ -656,7 +676,7 @@ public override void OnNetworkDespawn()
             Camera.main.transform.SetParent(null, false);
             if (m_Minebot != null)
             {
-                m_Minebot.NetworkObject.TryRemoveParent();
+                DetachMineFromShip();
             }
         }
         else
@@ -668,6 +688,9 @@ public override void OnNetworkDespawn()
         m_Minebot = null;
         m_MinebotLocked = false;
         m_MinebotLocking = false;
+        m_RotationRate = 0.0f;
+        m_RotationThrust = 0.0f;
+        m_ForwardThrust = 0.0f;
 
         if (TractorBeam != null)
         {
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Assets/UniversalRenderPipelineGlobalSettings.asset b/Experimental/Asteroids-CMB-NGO-Sample/Assets/UniversalRenderPipelineGlobalSettings.asset
index 437cf008c..f14cc0a14 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Assets/UniversalRenderPipelineGlobalSettings.asset
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Assets/UniversalRenderPipelineGlobalSettings.asset
@@ -55,18 +55,7 @@ MonoBehaviour:
       - rid: 1218312935704363110
       - rid: 1218312841654960128
     m_RuntimeSettings:
-      m_List:
-      - rid: 6153537856141787137
-      - rid: 6153537856141787139
-      - rid: 6153537856141787141
-      - rid: 6153537856141787143
-      - rid: 6153537856141787144
-      - rid: 6153537856141787145
-      - rid: 6153537856141787146
-      - rid: 6153537856141787149
-      - rid: 6153537856141787151
-      - rid: 6153537856141787154
-      - rid: 1218312841654960128
+      m_List: []
   m_AssetVersion: 8
   m_ObsoleteDefaultVolumeProfile: {fileID: 0}
   m_RenderingLayerNames:
@@ -125,6 +114,7 @@ MonoBehaviour:
         m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3}
         m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3}
         m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3}
+        m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
         m_DefaultCustomMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
         m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
         m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
@@ -244,6 +234,7 @@ MonoBehaviour:
       data:
         m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3}
         m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3}
+        m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3}
     - rid: 6153537856141787149
       type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
       data:
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/Packages/manifest.json b/Experimental/Asteroids-CMB-NGO-Sample/Packages/manifest.json
index 1814e6e2a..44248f5b0 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/Packages/manifest.json
+++ b/Experimental/Asteroids-CMB-NGO-Sample/Packages/manifest.json
@@ -5,21 +5,21 @@
     "com.unity.ads": "4.4.2",
     "com.unity.ai.navigation": "2.0.0",
     "com.unity.analytics": "3.8.1",
-    "com.unity.collab-proxy": "2.3.1",
+    "com.unity.collab-proxy": "2.4.3",
     "com.unity.collections": "2.4.1",
     "com.unity.feature.development": "1.0.2",
     "com.unity.ide.rider": "3.0.28",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.memoryprofiler": "1.1.0",
-    "com.unity.multiplayer.playmode": "1.1.0",
+    "com.unity.multiplayer.playmode": "1.2.0",
     "com.unity.multiplayer.tools": "2.1.0",
-    "com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0",
+    "com.unity.netcode.gameobjects": "2.0.0-pre.3",
     "com.unity.nuget.newtonsoft-json": "3.2.1",
-    "com.unity.purchasing": "4.11.0",
+    "com.unity.purchasing": "4.12.0",
     "com.unity.render-pipelines.universal": "17.0.3",
-    "com.unity.services.multiplayer": "0.4.2",
+    "com.unity.services.multiplayer": "1.0.0-pre.1",
     "com.unity.test-framework": "1.4.4",
-    "com.unity.timeline": "1.8.6",
+    "com.unity.timeline": "1.8.7",
     "com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.3",
     "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",
     "com.unity.transport": "2.3.0",
diff --git a/Experimental/Asteroids-CMB-NGO-Sample/ProjectSettings/ProjectVersion.txt b/Experimental/Asteroids-CMB-NGO-Sample/ProjectSettings/ProjectVersion.txt
index b66c9216c..59d74ae16 100644
--- a/Experimental/Asteroids-CMB-NGO-Sample/ProjectSettings/ProjectVersion.txt
+++ b/Experimental/Asteroids-CMB-NGO-Sample/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.0.5f1
-m_EditorVersionWithRevision: 6000.0.5f1 (17028576122a)
+m_EditorVersion: 6000.0.10f1
+m_EditorVersionWithRevision: 6000.0.10f1 (413673acabac)